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

Commit cdd5f655 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix missing dependency on R.java" am: 227a1765 am: bfd44220 

am: 0903ecb9

Change-Id: I2b50adaa9ed052cf3022a78a77729c3b618834f8
parents aa5cf5b9 0903ecb9

Android.mk

+7 −8
Original line number Diff line number Diff line
@@ -491,6 +491,12 @@ LOCAL_INTERMEDIATE_SOURCES := \ 
			$(framework_res_source_path)/android/Manifest.java \

			$(framework_res_source_path)/com/android/internal/R.java



# Make sure that R.java and Manifest.java are built before we build

# the source for this library.

framework_res_R_stamp := \

	$(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp

LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj core-libart core-lambda-stubs conscrypt okhttp core-junit bouncycastle ext

LOCAL_STATIC_JAVA_LIBRARIES := framework-protos
@@ -506,15 +512,8 @@ LOCAL_EMMA_INSTRUMENT := true 
endif



include $(BUILD_JAVA_LIBRARY)

framework_module := $(LOCAL_INSTALLED_MODULE)



# Make sure that R.java and Manifest.java are built before we build

# the source for this library.

framework_res_R_stamp := \

	$(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp

$(full_classes_compiled_jar): $(framework_res_R_stamp)

$(built_dex_intermediate): $(framework_res_R_stamp)



framework_module := $(LOCAL_INSTALLED_MODULE)

$(framework_module): | $(dir $(framework_module))framework-res.apk



framework_built := $(call java-lib-deps,framework)