Merge "Re-write the module override logic."
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 58d838d..4db8f27 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -774,6 +774,8 @@
ALL_MODULES.$(my_register_name).MODULE_NAME := $(LOCAL_MODULE)
ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES := $(LOCAL_COMPATIBILITY_SUITE)
ALL_MODULES.$(my_register_name).TEST_CONFIG := $(test_config)
+ALL_MODULES.$(my_register_name).SRCS := \
+ $(ALL_MODULES.$(my_register_name).SRCS) $(LOCAL_SRC_FILES)
test_config :=
INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)
diff --git a/core/binary.mk b/core/binary.mk
index 440c32d..a594149 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1360,7 +1360,7 @@
my_warn_types :=
my_allowed_types := native:vendor native:vndk
endif
-else ifneq ($(filter $(TARGET_RECOVERY_OUT)/%,$(LOCAL_MODULE_PATH)),)
+else ifneq ($(filter $(TARGET_RECOVERY_OUT)/%,$(call get_non_asan_path,$(LOCAL_MODULE_PATH))),)
my_link_type := native:recovery
my_warn_types :=
# TODO(b/113303515) remove native:platform and my_allowed_ndk_types
diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index 4c582e3..b3cbb9c 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -13,8 +13,6 @@
# all paths under out dir
PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \
target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \
- target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java_intermediates \
- target/common/obj/JAVA_LIBRARIES/android.hidl.manager-V1.0-java_intermediates \
target/common/obj/JAVA_LIBRARIES/android-common_intermediates \
target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \
target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates \
diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk
index ff83357..3b4a98f 100644
--- a/core/tasks/module-info.mk
+++ b/core/tasks/module-info.mk
@@ -15,6 +15,8 @@
'"auto_test_config": [$(ALL_MODULES.$(m).auto_test_config)], ' \
'"module_name": "$(ALL_MODULES.$(m).MODULE_NAME)", ' \
'"test_config": [$(if $(ALL_MODULES.$(m).TEST_CONFIG),"$(ALL_MODULES.$(m).TEST_CONFIG)")], ' \
+ '"dependencies": [$(foreach w,$(sort $(ALL_DEPS.$(m).ALL_DEPS)),"$(w)", )], ' \
+ '"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \
'},\n' \
) | sed -e 's/, *\]/]/g' -e 's/, *\}/ }/g' -e '$$s/,$$//' >> $@
$(hide) echo '}' >> $@
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index bcbb951..6cc6561 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -270,9 +270,7 @@
framework \
telephony-common \
voip-common \
- ims-common \
- android.hidl.base-V1.0-java \
- android.hidl.manager-V1.0-java
+ ims-common
# Add the compatibility library that is needed when org.apache.http.legacy
# is removed from the bootclasspath.
