diff options
author | Paul Duffin <paulduffin@google.com> | 2020-05-19 07:55:45 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-05-19 07:55:45 +0000 |
commit | 73506b587efde77cb502d9f166a0d453d5666e42 (patch) | |
tree | 19a8794f65a0a46c633d926e9fa428112d37eb30 | |
parent | 17c65e76d4f5039be3b4a72efcbded7b78113757 (diff) | |
parent | 7c3a0de9ad2d39f53740b13092183c46df68f0f7 (diff) | |
download | ike-73506b587efde77cb502d9f166a0d453d5666e42.tar.gz |
Merge "Enabled module_lib in android.net.ipsec.ike"
-rw-r--r-- | Android.bp | 36 |
1 files changed, 3 insertions, 33 deletions
@@ -14,8 +14,8 @@ java_sdk_library { name: "android.net.ipsec.ike", + defaults: ["framework-module-defaults"], installable: true, - sdk_version: "module_current", aidl: { local_include_dirs: ["src/java"], @@ -28,7 +28,6 @@ java_sdk_library { libs: [ "unsupportedappusage", - "framework-annotations-lib", ], api_packages: [ @@ -41,13 +40,13 @@ java_sdk_library { // being overwritten by the frameworks class copies. jarjar_rules: "jarjar-rules-shared.txt", - plugins: ["java_api_finder"], - hostdex: true, // for hiddenapi check apex_available: [ "com.android.ipsec", "test_com.android.ipsec", ], + + stubs_library_visibility: ["//visibility:public"], } filegroup { @@ -86,32 +85,3 @@ java_library { // being overwritten by the frameworks class copies. jarjar_rules: "jarjar-rules-shared.txt", } - -stubs_defaults { - name: "ike-stubs-defaults", - srcs: [":ike-api-srcs"], -} - -droidstubs { - name: "android.net.ipsec.ike.api.sources.module_libs_api", - defaults: [ - "framework-module-api-defaults-module_libs_api", - "ike-stubs-defaults", - ], - dist: { dest: "android.net.ipsec.ike.txt" }, -} - -droidstubs { - name: "android.net.ipsec.ike.stubs.sources.module_libs_api", - defaults: [ - "framework-module-stubs-defaults-module_libs_api", - "ike-stubs-defaults", - ], -} - -java_library { - name: "android.net.ipsec.ike.stubs.module_libs_api", - srcs: [":android.net.ipsec.ike.stubs.sources.module_libs_api"], - defaults: ["framework-module-stubs-lib-defaults-module_libs_api"], - dist: { dest: "android.net.ipsec.ike.jar" }, -} |