diff options
| author | Jake Weinstein <jake@aospa.co> | 2022-08-25 11:47:33 +0900 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-09-03 02:20:50 +0800 |
| commit | 53b50a082c7368eb689a42d26f27300848272d01 (patch) | |
| tree | 696afaa705eda6390b94a0415ab8d9544e50d217 | |
| parent | 31fb0000d655c4eb863d82a277e0c2d832fc452f (diff) | |
Revert "lights: Add soong configs for lights aidl"tachibana
We don't need to support multiple Android
Versions in the same tree, so revert to
avoid unnecessary complexity.
This reverts commit 24a8a69dba1a880066556108af4d78d358687d9f.
Change-Id: If2e9e36d6d37c9bbcd51a163a17be698c7caa047
| -rw-r--r-- | base.mk | 12 | ||||
| -rw-r--r-- | lights/Android.bp | 42 |
2 files changed, 1 insertions, 53 deletions
@@ -606,18 +606,6 @@ LIBPOWER += android.hardware.power@1.0-impl LIBPOWER += android.hardware.power@1.0-service endif -ifeq ($(PLATFORM_VERSION), $(filter $(PLATFORM_VERSION),R 11)) - SOONG_CONFIG_NAMESPACES += lights - SOONG_CONFIG_lights += lighttargets - SOONG_CONFIG_lights_lighttargets := lightaidltarget -endif - -ifeq ($(PLATFORM_VERSION), $(filter $(PLATFORM_VERSION),S 12)) - SOONG_CONFIG_NAMESPACES += lights - SOONG_CONFIG_lights += lighttargets - SOONG_CONFIG_lights_lighttargets := lightaidlV1target -endif - #LLVM for RenderScript #use qcom LLVM $(call inherit-product-if-exists, external/llvm/llvm-select.mk) diff --git a/lights/Android.bp b/lights/Android.bp index 523285a..99b3464 100644 --- a/lights/Android.bp +++ b/lights/Android.bp @@ -1,46 +1,5 @@ -// This introduces the module type lights_cc_defaults -// If target.mk file contained: -// -// SOONG_CONFIG_NAMESPACES += lights -// SOONG_CONFIG_lights += lighttargets -// SOONG_CONFIG_lights_lighttargets := lightaidltarget -// -// Then ligets lib would build with shared_libs - -soong_config_module_type { - name: "lights_cc_defaults", - module_type: "cc_defaults", - config_namespace: "lights", - variables: ["lighttargets"], - properties: ["shared_libs"], -} - -soong_config_string_variable { - name: "lighttargets", - values: ["lightaidltarget", "lightaidlV1target"], -} - -lights_cc_defaults { - name: "lights_defaults", - soong_config_variables: { - lighttargets: { - lightaidltarget: { - shared_libs: [ - "android.hardware.light-ndk_platform", - ], - }, - lightaidlV1target: { - shared_libs: [ - "android.hardware.light-V1-ndk_platform", - ], - }, - }, - }, -} - cc_binary { name: "android.hardware.lights-service.qti", - defaults: ["lights_defaults"], relative_install_path: "hw", init_rc: ["android.hardware.lights-qti.rc"], vintf_fragments: ["android.hardware.lights-qti.xml"], @@ -50,6 +9,7 @@ cc_binary { "liblog", "libhardware", "libbinder_ndk", + "android.hardware.light-V1-ndk", ], srcs: [ "Lights.cpp", |