diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:02:16 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:02:16 +0000 |
commit | 994dfc943c6cb7a1564399a4999ee82098836599 (patch) | |
tree | 2c04ed018febfb97d63d0a9c28584bae58302c38 /cmds/installd/Android.bp | |
parent | b288e591b5546b00c17dc78634c87aeee6af4746 (diff) | |
parent | 8c838655316b24ee30515cdffb13ead5a67aa83c (diff) | |
download | native-android12-mainline-tzdata2-release.tar.gz |
Snap for 8426163 from 8c838655316b24ee30515cdffb13ead5a67aa83c to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100
Change-Id: I3f24fd1f52757411f691188c361389cd2216b5be
Diffstat (limited to 'cmds/installd/Android.bp')
-rw-r--r-- | cmds/installd/Android.bp | 57 |
1 files changed, 10 insertions, 47 deletions
diff --git a/cmds/installd/Android.bp b/cmds/installd/Android.bp index 3f180d94a7..8ff4dd862d 100644 --- a/cmds/installd/Android.bp +++ b/cmds/installd/Android.bp @@ -1,12 +1,3 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_native_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_native_license"], -} - cc_defaults { name: "installd_defaults", @@ -26,15 +17,15 @@ cc_defaults { "InstalldNativeService.cpp", "QuotaUtils.cpp", "dexopt.cpp", - "execv_helper.cpp", "globals.cpp", - "run_dex2oat.cpp", - "unique_file.cpp", "utils.cpp", "utils_default.cpp", "view_compiler.cpp", ":installd_aidl", ], + header_libs: [ + "dex2oat_headers", + ], shared_libs: [ "libbase", "libbinder", @@ -47,12 +38,6 @@ cc_defaults { "libutils", "server_configurable_flags", ], - static_libs: [ - "libasync_safe", - ], - export_shared_lib_headers: [ - "libbinder", - ], product_variables: { arc: { @@ -118,28 +103,6 @@ cc_library_headers { } // -// Unit tests -// - -cc_test_host { - name: "run_dex2oat_test", - test_suites: ["general-tests"], - clang: true, - srcs: [ - "run_dex2oat_test.cpp", - "run_dex2oat.cpp", - "unique_file.cpp", - "execv_helper.cpp", - ], - cflags: ["-Wall", "-Werror"], - shared_libs: [ - "libbase", - "server_configurable_flags", - ], - test_config: "run_dex2oat_test.xml", -} - -// // Executable // @@ -192,15 +155,16 @@ cc_binary { "liblog", "libutils", ], - required: [ - "apexd" + static_libs: [ + "libapexd", ], } filegroup { name: "installd_aidl", srcs: [ - "binder/**/*.aidl", + "binder/android/os/IInstalld.aidl", + "binder/android/os/storage/CrateMetadata.aidl", ], path: "binder", } @@ -241,19 +205,18 @@ cc_binary { srcs: [ "dexopt.cpp", - "execv_helper.cpp", "globals.cpp", "otapreopt.cpp", "otapreopt_utils.cpp", - "run_dex2oat.cpp", - "unique_file.cpp", "utils.cpp", "utils_default.cpp", "view_compiler.cpp", ], + header_libs: ["dex2oat_headers"], + static_libs: [ - "libasync_safe", + "libartimagevalues", "libdiskusage", "libotapreoptparameters", ], |