tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflicts of c8cfac9 to nyc-dev-plus-aosp

Browse source 
Change-Id: I77317dcaaa4154d6649b36b215df1474721a6503
This commit is contained in:
Yohann Roussel 2016-03-18 10:12:27 +01:00
commit 0ee9995724
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/Makefile
View file

@ -2105,6 +2105,7 @@ $(INTERNAL_SDK_TARGET): $(deps)
-v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \
-v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \ -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \
-v "FONT_OUT=$(SDK_FONT_TEMP)" \ -v "FONT_OUT=$(SDK_FONT_TEMP)" \
-v "JACK_SDKTOOL_VERSION=$(JACK_SDKTOOL_VERSION)" \
-o $(PRIVATE_DIR) && \ -o $(PRIVATE_DIR) && \
cp -f $(target_notice_file_txt) \ cp -f $(target_notice_file_txt) \
$(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \

3
core/config.mk
View file

@ -499,8 +499,6 @@ prebuilt_sdk_tools_bin :=
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Generic tools. # Generic tools.
JACK := $(HOST_OUT_EXECUTABLES)/jack JACK := $(HOST_OUT_EXECUTABLES)/jack
JACK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack.jar
JILL_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jill.jar
LEX := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/flex/flex-2.5.39 LEX := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/flex/flex-2.5.39
# The default PKGDATADIR built in the prebuilt bison is a relative path # The default PKGDATADIR built in the prebuilt bison is a relative path
@ -565,7 +563,6 @@ endif
# Turn off jack warnings by default. # Turn off jack warnings by default.
DEFAULT_JACK_EXTRA_ARGS += --verbose error DEFAULT_JACK_EXTRA_ARGS += --verbose error
JILL := java -jar $(JILL_JAR)
PROGUARD := external/proguard/bin/proguard.sh PROGUARD := external/proguard/bin/proguard.sh
JAVATAGS := build/tools/java-event-log-tags.py JAVATAGS := build/tools/java-event-log-tags.py
RMTYPEDEFS := $(HOST_OUT_EXECUTABLES)/rmtypedefs RMTYPEDEFS := $(HOST_OUT_EXECUTABLES)/rmtypedefs