diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-22 11:31:59 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2010-07-22 11:31:59 -0700 |
commit | 85581a1ba81105740cc1e87bfad040bbac4662ec (patch) | |
tree | e2a3583fb94ae0373debe01873304210739254ae | |
parent | b96e8a8cc629c3e3a196263cc548bd55824e4ade (diff) | |
parent | 7adbf97d110ebe137579e1078e3846aa4f3c6c2c (diff) | |
download | build-85581a1ba81105740cc1e87bfad040bbac4662ec.zip build-85581a1ba81105740cc1e87bfad040bbac4662ec.tar.gz build-85581a1ba81105740cc1e87bfad040bbac4662ec.tar.bz2 |
merge from open-source master
Change-Id: Ide7fbe06d7f9c1a06827365f006ddc7a01ba4dab
-rw-r--r-- | core/clear_vars.mk | 1 | ||||
-rw-r--r-- | core/definitions.mk | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index f311a70..04a5299 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -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. diff --git a/core/definitions.mk b/core/definitions.mk index d213991..cc638c5 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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 ) |