LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete jack support

Browse Source 
Remove references to jack files that no longer exist.

Bug: 65302138
Test: m PRODUCT-sdk_phone_x86_64-sdk dist sdk_repo
Change-Id: I6e68fbffc49362ec691db966032e8e01d5f01756
This commit is contained in:
Colin Cross
2017-10-02 12:23:58 -07:00
parent 8cf7af55ef
commit cfcfb28d9a
3 changed files with 3 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/Android.mk
View File

@@ -89,14 +89,6 @@ ALL_SDK_FILES += $(android_jar_src_target)
# ====================================================
# The Jack & Jill compiler jars
ALL_SDK_FILES += prebuilts/sdk/tools/jacks/jack-$(JACK_SDKTOOL_VERSION).jar
ALL_SDK_FILES += prebuilts/sdk/tools/jills/jill-$(JACK_SDKTOOL_VERSION).jar
# The Jack reporter tool for code coverage
ALL_SDK_FILES += prebuilts/sdk/tools/jack-jacoco-reporter.jar
ALL_SDK_FILES += prebuilts/sdk/tools/jack-coverage-plugin.jar
# The uiautomator stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar

36
build/build_android_stubs.mk
View File

@@ -20,16 +20,14 @@
intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(sdk_stub_name)_intermediates
full_target := $(intermediates)/classes.jar
header_target := $(intermediates)/classes-header.jar
jack_lib := $(intermediates)/classes.jack
dex_toc := $(intermediates)/classes.dex.toc
full_src_target = $(intermediates)/android-stubs-src.jar
src_dir := $(intermediates)/src
classes_dir := $(intermediates)/classes
framework_res_package := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
$(full_target) $(jack_lib) $(full_src_target): PRIVATE_SRC_DIR := $(src_dir)
$(full_target) $(jack_lib) $(full_src_target): PRIVATE_INTERMEDIATES_DIR := $(intermediates)
$(full_target) $(jack_lib): PRIVATE_FRAMEWORK_RES_PACKAGE := $(framework_res_package)
$(full_target) $(full_src_target): PRIVATE_SRC_DIR := $(src_dir)
$(full_target) $(full_src_target): PRIVATE_INTERMEDIATES_DIR := $(intermediates)
$(full_target): PRIVATE_FRAMEWORK_RES_PACKAGE := $(framework_res_package)
$(full_target): PRIVATE_CLASS_INTERMEDIATES_DIR := $(classes_dir)
@@ -75,32 +73,4 @@ $(full_target): $(stub_timestamp) $(framework_res_package) $(ZIPTIME)
.KATI_RESTAT: $(full_target)
$(jack_lib) : $(stub_timestamp) $(framework_res_package) $(JACK_DEFAULT_ARGS) $(JACK) | setup-jack-server
@echo Compiling SDK Stubs with Jack: $@
rm -rf $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp
$(hide) if [ ! -f $(PRIVATE_FRAMEWORK_RES_PACKAGE) ]; then \
echo Missing file $(PRIVATE_FRAMEWORK_RES_PACKAGE); \
exit 1; \
fi;
mkdir -p $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp
$(hide) unzip -qo $(PRIVATE_FRAMEWORK_RES_PACKAGE) -d $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp
$(hide) mkdir -p $(dir $@)
$(hide) find $(PRIVATE_SRC_DIR) -name "*.java" > \
$(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.java-source-list
$(call call-jack) \
-D jack.java.source.version=1.8 \
-D jack.android.min-api-level=$(PLATFORM_JACK_MIN_SDK_VERSION) \
--import-resource $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp \
--output-jack $@ \
@$(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.java-source-list \
|| ( rm -f $@ ; $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp ; exit 41 )
$(hide) rm -rf $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp
$(eval $(call copy-one-file,$(full_target),$(header_target)))
# As we don't have .dex file for the SDK stub, we cannot generate .toc
# file from .dex file. Use classes.jar instead.
$(dex_toc): $(full_target) $(jack_lib)
$(hide) cp $< $@.tmp
$(call commit-change-for-toc, $@)
.KATI_RESTAT: $(dex_toc)

8
build/sdk.atree
View File

@@ -144,14 +144,6 @@ prebuilts/sdk/tools/lib/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/s
dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/mainDexClasses.rules
dalvik/dx/etc/mainDexClassesNoAapt.rules build-tools/${PLATFORM_NAME}/mainDexClassesNoAapt.rules
# Jack & Jill
prebuilts/sdk/tools/jacks/jack-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jack.jar
prebuilts/sdk/tools/jills/jill-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jill.jar
# The Jack reporter tool for code coverage
prebuilts/sdk/tools/jack-jacoco-reporter.jar build-tools/${PLATFORM_NAME}/jack-jacoco-reporter.jar
prebuilts/sdk/tools/jack-coverage-plugin.jar build-tools/${PLATFORM_NAME}/jack-coverage-plugin.jar
# Lambda stubs for use by javac
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar build-tools/${PLATFORM_NAME}/core-lambda-stubs.jar