Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3773dc82 authored by patricktu's avatar patricktu Committed by android-build-merger
Browse files

Merge "aidegen: Collect all java sources from makefile system." 

am: c18b2b28

Change-Id: I23f6091ee0df91f274394ecb34ecb002451514d1
parents 45cd372b c18b2b28

core/base_rules.mk

+0 −2
Original line number Diff line number Diff line
@@ -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)

core/java.mk

+1 −0
Original line number Diff line number Diff line
@@ -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