diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-06 02:14:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-06 02:14:54 +0000 |
| commit | c18b2b28c2d8c0879061b9d8ef38fad9e72b5ef2 (patch) | |
| tree | 320fa680df5387236d16bbf092eb47b977896d79 | |
| parent | d1242407195cd0b5e28c7d3060a5f589e1902a26 (diff) | |
| parent | b23d8e65021d8b8f8b114c0c44aac1d84780b096 (diff) | |
| download | build-c18b2b28c2d8c0879061b9d8ef38fad9e72b5ef2.tar.gz | |
Merge "aidegen: Collect all java sources from makefile system."
| -rw-r--r-- | core/base_rules.mk | 2 | ||||
| -rw-r--r-- | core/java.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index fcc8ede2f1..57fd8184c1 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -759,8 +759,6 @@ ALL_MODULES.$(my_register_name).FOR_HOST_CROSS := $(my_host_cross) 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/java.mk b/core/java.mk index 6ca2904cb3..c015e4ac37 100644 --- a/core/java.mk +++ b/core/java.mk @@ -170,6 +170,7 @@ java_sources := $(addprefix $(LOCAL_PATH)/, $(filter %.java,$(LOCAL_SRC_FILES))) $(filter %.java,$(LOCAL_GENERATED_SOURCES)) java_intermediate_sources := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/, $(filter %.java,$(LOCAL_INTERMEDIATE_SOURCES))) all_java_sources := $(java_sources) $(java_intermediate_sources) +ALL_MODULES.$(my_register_name).SRCS := $(ALL_MODULES.$(my_register_name).SRCS) $(all_java_sources) include $(BUILD_SYSTEM)/java_common.mk |