diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:17:01 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:17:01 -0700 |
| commit | 4daaf62c5ddc1075c178b8a014c39ad298c4cd98 (patch) | |
| tree | d095a8aa0c6659b367db754c4ee19778bb56f7a6 /Android.bp | |
| parent | a9be470bad7c54b2d8b15da55ab0f3a0bfeb05e5 (diff) | |
| parent | 785bd04e61c2fdee0f3f5d6fd527c066408c3b35 (diff) | |
| download | platform_packages_modules_NetworkStack-4daaf62c5ddc1075c178b8a014c39ad298c4cd98.tar.gz platform_packages_modules_NetworkStack-4daaf62c5ddc1075c178b8a014c39ad298c4cd98.tar.bz2 platform_packages_modules_NetworkStack-4daaf62c5ddc1075c178b8a014c39ad298c4cd98.zip | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Id3231d5748c6ec246fb4e9c2b57a8fe3b9f4cad9
Change-Id: Ic82e74502b06fdcd2bcf3cf5e7812f1fd1856fdd
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -48,8 +48,7 @@ java_defaults { java_defaults { name: "NetworkStackReleaseApiLevel", - // TODO: use system_30 once a prebuilt SDK is available for R - sdk_version: "system_current", + sdk_version: "system_30", min_sdk_version: "29", target_sdk_version: "30", } @@ -130,7 +129,7 @@ android_library { defaults: ["NetworkStackReleaseApiLevel"], srcs: [ "src/**/*.java", - ":statslog-networkstack-java-gen-q", + ":statslog-networkstack-java-gen", ], // API stable uses a jarjared version of the shims static_libs: [ @@ -256,15 +255,6 @@ cc_library_shared { } genrule { - name: "statslog-networkstack-java-gen-q", - tools: ["stats-log-api-gen"], - cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" + - " --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog" + - " --compileQ", - out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"], -} - -genrule { name: "statslog-networkstack-java-gen", tools: ["stats-log-api-gen"], cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" + |