diff options
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/config.mk b/core/config.mk index c6f6288..3240e94 100644 --- a/core/config.mk +++ b/core/config.mk @@ -105,11 +105,8 @@ TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=addre # TODO: do symbol compression TARGET_COMPRESS_MODULE_SYMBOLS := false -# Default is to prelink modules. -TARGET_PRELINK_MODULE := true - -# Default shell is ash. Other possible value is mksh. -TARGET_SHELL := ash +# Default shell is mksh. Other possible value is ash. +TARGET_SHELL := mksh # ############################################################### # Include sub-configuration files @@ -236,10 +233,6 @@ FINDBUGS := prebuilt/common/findbugs/bin/findbugs LOCALIZE := $(HOST_OUT_EXECUTABLES)/localize$(HOST_EXECUTABLE_SUFFIX) EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX) -# Binary prelinker/compressor tools -APRIORI := $(HOST_OUT_EXECUTABLES)/apriori$(HOST_EXECUTABLE_SUFFIX) -LSD := $(HOST_OUT_EXECUTABLES)/lsd$(HOST_EXECUTABLE_SUFFIX) - # Deal with archaic version of bison on Mac OS X. ifeq ($(filter 1.28,$(shell $(YACC) -V)),) YACC_HEADER_SUFFIX:= .hpp @@ -284,6 +277,11 @@ else MD5SUM:=md5sum endif +APICHECK_CLASSPATH := $(HOST_JDK_TOOLS_JAR) +APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) +APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX) +APICHECK_COMMAND := $(APICHECK) -JXmx1024m -J"classpath $(APICHECK_CLASSPATH)" + # ############################################################### # Set up final options. # ############################################################### @@ -356,7 +354,7 @@ TARGET_AVAILABLE_NDK_VERSIONS := $(call numerically_sort,\ $(patsubst $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r%,%, \ $(wildcard $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r*))) -INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml +INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.txt # This is the standard way to name a directory containing prebuilt target # objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so |