StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: Ide7fbe06d7f9c1a06827365f006ddc7a01ba4dab
This commit is contained in:
The Android Open Source Project
2010-07-22 11:31:59 -07:00
parent b96e8a8cc6 7adbf97d11
commit 85581a1ba8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@@ -95,6 +95,7 @@ LOCAL_NO_EMMA_COMPILE:=
LOCAL_PROGUARD_ENABLED:= # '',optonly,full,custom LOCAL_PROGUARD_ENABLED:= # '',optonly,full,custom
LOCAL_PROGUARD_FLAGS:= LOCAL_PROGUARD_FLAGS:=
LOCAL_EMMA_COVERAGE_FILTER:= LOCAL_EMMA_COVERAGE_FILTER:=
LOCAL_WARNINGS_ENABLE:=
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time. # iterate over thousands of entries every time.

5
core/definitions.mk
View File

@@ -1239,7 +1239,7 @@ endef
ifeq ($(HOST_OS),windows) ifeq ($(HOST_OS),windows)
xlint_unchecked := xlint_unchecked :=
else else
#xlint_unchecked := -Xlint:unchecked xlint_unchecked := -Xlint:unchecked
endif endif
# emit-line, <word list>, <output file> # 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) \ $(hide) $(TARGET_JAVAC) -encoding ascii $(PRIVATE_BOOTCLASSPATH) \
$(addprefix -classpath ,$(strip \ $(addprefix -classpath ,$(strip \
$(call normalize-path-list,$(PRIVATE_ALL_JAVA_LIBRARIES)))) \ $(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) \ -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
\@$(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list-uniq \ \@$(dir $(PRIVATE_CLASS_INTERMEDIATES_DIR))/java-source-list-uniq \
|| ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )