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

Commit 98892291 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 3afc688a: Merge "javac: rename common_flags to avoid conflictions" 

* commit '3afc688a':
  javac: rename common_flags to avoid conflictions
parents 05a7a955 3afc688a

core/combo/javac.mk

+4 −4
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
#



ifneq ($(LEGACY_USE_JAVA6),)

common_flags := -target 1.5 -Xmaxerrs 9999999

common_jdk_flags := -target 1.5 -Xmaxerrs 9999999

else

common_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999

common_jdk_flags := -source 1.7 -target 1.7 -Xmaxerrs 9999999

endif



# Use the indexer wrapper to index the codebase instead of the javac compiler
@@ -25,9 +25,9 @@ endif 
# Whatever compiler is on this system.

ifeq ($(BUILD_OS), windows)

    COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \

        $(common_flags)

        $(common_jdk_flags)

else

    COMMON_JAVAC := $(JAVACC) -J-Xmx1024M $(common_flags)

    COMMON_JAVAC := $(JAVACC) -J-Xmx1024M $(common_jdk_flags)

endif



# Eclipse.