resolved conflicts for merge of 9a3b17d1
to jb-mr2-dev
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
This commit is contained in:
@@ -50,6 +50,8 @@ endif # LOCAL_BUILD_HOST_DEX
|
||||
|
||||
include $(BUILD_SYSTEM)/base_rules.mk
|
||||
|
||||
$(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g
|
||||
|
||||
java_alternative_checked_module :=
|
||||
|
||||
# The layers file allows you to enforce a layering between java packages.
|
||||
|
Reference in New Issue
Block a user