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

Commit 85581a1b authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: Ide7fbe06d7f9c1a06827365f006ddc7a01ba4dab
parents b96e8a8c 7adbf97d

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ LOCAL_NO_EMMA_COMPILE:= 
LOCAL_PROGUARD_ENABLED:= # '',optonly,full,custom

LOCAL_PROGUARD_FLAGS:=

LOCAL_EMMA_COVERAGE_FILTER:=

LOCAL_WARNINGS_ENABLE:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

core/definitions.mk

+3 −2
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ endef 
ifeq ($(HOST_OS),windows)

xlint_unchecked :=

else

#xlint_unchecked := -Xlint:unchecked

xlint_unchecked := -Xlint:unchecked

endif



# emit-line, <word list>, <output file>
@@ -1309,7 +1309,8 @@ $(hide) tr ' ' '\n' < $(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list 
$(hide) $(TARGET_JAVAC) -encoding ascii $(PRIVATE_BOOTCLASSPATH) \

    $(addprefix -classpath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_ALL_JAVA_LIBRARIES)))) \

    $(PRIVATE_JAVACFLAGS) $(strip $(PRIVATE_JAVAC_DEBUG_FLAGS)) $(xlint_unchecked) \

    $(PRIVATE_JAVACFLAGS) $(strip $(PRIVATE_JAVAC_DEBUG_FLAGS)) \

	$(if $(findstring true,$(LOCAL_WARNINGS_ENABLE)),$(xlint_unchecked),) \

    -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \

    \@$(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list-uniq \

    || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )