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

Commit 0ee99957 authored by Yohann Roussel's avatar Yohann Roussel
Browse files

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

Change-Id: I77317dcaaa4154d6649b36b215df1474721a6503
parents 4bcbf055 c8cfac94

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2105,6 +2105,7 @@ $(INTERNAL_SDK_TARGET): $(deps) 
			-v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \

			-v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \

			-v "FONT_OUT=$(SDK_FONT_TEMP)" \

			-v "JACK_SDKTOOL_VERSION=$(JACK_SDKTOOL_VERSION)" \

			-o $(PRIVATE_DIR) && \

		cp -f $(target_notice_file_txt) \

				$(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \

core/config.mk

+0 −3
Original line number Diff line number Diff line
@@ -499,8 +499,6 @@ prebuilt_sdk_tools_bin := 
# ---------------------------------------------------------------

# Generic tools.

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

# The default PKGDATADIR built in the prebuilt bison is a relative path
@@ -565,7 +563,6 @@ endif 
# Turn off jack warnings by default.

DEFAULT_JACK_EXTRA_ARGS += --verbose error



JILL := java -jar $(JILL_JAR)

PROGUARD := external/proguard/bin/proguard.sh

JAVATAGS := build/tools/java-event-log-tags.py

RMTYPEDEFS := $(HOST_OUT_EXECUTABLES)/rmtypedefs