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

Commit 29b1afee authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Remove JILL, JACK_JAR and JILL_JAR 

Also ensure that sdk.atree can find jack.jar and jill.jar from prebuilt.

Bug: 27372042

(cherry picked from commit 233584bb)

Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
parent f7cadb8c

core/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -2101,6 +2101,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 && \

core/config.mk

+0 −3
Original line number Original line Diff line number Diff line
@@ -498,8 +498,6 @@ endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK 
# ---------------------------------------------------------------

# ---------------------------------------------------------------

# 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