From cfcfb28d9a8b4cc9feb835c9c6fb0d21b9c52d0c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 2 Oct 2017 12:23:58 -0700
Subject: [PATCH] Delete jack support

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
---
 build/Android.mk             |  8 --------
 build/build_android_stubs.mk | 36 +++---------------------------------
 build/sdk.atree              |  8 --------
 3 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/build/Android.mk b/build/Android.mk
index 2a6d6fa00..b0c175fca 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -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
 
diff --git a/build/build_android_stubs.mk b/build/build_android_stubs.mk
index c4db3c723..212835175 100644
--- a/build/build_android_stubs.mk
+++ b/build/build_android_stubs.mk
@@ -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)
diff --git a/build/sdk.atree b/build/sdk.atree
index 4e4b5e388..7db8b8c68 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -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