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

Commit a340b87c authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Forbid depending directly on SDK modules." am: efd60849 am: 20da4aa2 

am: d17f99a6

Change-Id: Ieca49ad20c2d3fdd616948895059884adfc1a137
parents cab0d39d d17f99a6

core/java_common.mk

+9 −0
Original line number Diff line number Diff line
@@ -225,6 +225,15 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCE_LIST := $(java_source_list_fi 


$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RMTYPEDEFS := $(LOCAL_RMTYPEDEFS)



# Sanity check class path vars.

disallowed_deps := $(foreach sdk,$(TARGET_AVAILABLE_SDK_VERSIONS),$(call resolve-prebuilt-sdk-module,$(sdk)))

disallowed_deps += $(foreach sdk,$(TARGET_AVAILABLE_SDK_VERSIONS),\

  $(foreach sdk_lib,$(JAVA_SDK_LIBRARIES),$(call resolve-prebuilt-sdk-module,$(sdk),$(sdk_lib))))

bad_deps := $(filter $(disallowed_deps),$(LOCAL_JAVA_LIBRARIES) $(LOCAL_STATIC_JAVA_LIBRARIES))

ifneq (,$(bad_deps))

  $(call pretty-error,SDK modules should not be depended on directly. Please use LOCAL_SDK_VERSION for $(bad_deps))

endif



full_java_bootclasspath_libs :=

empty_bootclasspath :=

my_system_modules :=