From d2ba724f7f4a12ea68f5bb15e9b5e1580859e922 Mon Sep 17 00:00:00 2001
From: Jeff Gaston <jeffrygaston@google.com>
Date: Wed, 31 Jan 2018 17:34:07 -0500
Subject: [PATCH] Add rule to enable running Jetifier within Make against Java
 modules

The only case where we expect to actually enable this behavior is for
modules that are just an unpacking of a prebuilt, because those are
the only cases for which we can't conveniently just change the source

Bug: 72552006
Test: ./build/soong/scripts/diff_build_graphs.sh \
      --products=aosp_arm 'build/make:work^' \
      'build/make:work'
Test: cherry-pick the following patch that depends on this one and
      the rest of that patch's topic, and then do `m -j jeffapp`

Change-Id: I62e231900d6d87673ddf19c7fc2686fef2828590
---
 core/clear_vars.mk        |  1 +
 core/config.mk            |  2 ++
 core/host_java_library.mk | 10 ++++++++--
 core/java.mk              | 10 ++++++++--
 core/jetifier.mk          | 34 ++++++++++++++++++++++++++++++++++
 5 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 core/jetifier.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 36f9dec7c..0d9f5e31c 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -135,6 +135,7 @@ LOCAL_JAVA_LAYERS_FILE:=
 LOCAL_JAVA_LIBRARIES:=
 LOCAL_JAVA_RESOURCE_DIRS:=
 LOCAL_JAVA_RESOURCE_FILES:=
+LOCAL_JETIFIER_ENABLED:=
 LOCAL_JNI_SHARED_LIBRARIES:=
 LOCAL_JNI_SHARED_LIBRARIES_ABI:=
 LOCAL_LDFLAGS:=
diff --git a/core/config.mk b/core/config.mk
index 546ebb269..33705fa42 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -695,6 +695,8 @@ RELOCATION_PACKER := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/relocation
 FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin
 FINDBUGS := $(FINDBUGS_DIR)/findbugs
 
+JETIFIER := prebuilts/sdk/tools/jetifier/jetifier-standalone/bin/jetifier-standalone
+
 # Tool to merge AndroidManifest.xmls
 ANDROID_MANIFEST_MERGER_CLASSPATH := \
     prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/26.0.0-beta2/manifest-merger-26.0.0-beta2.jar \
diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index f34f2f140..a6337ebb7 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -102,10 +102,16 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \
 	$(MERGE_ZIPS) -j $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \
             -stripDir META-INF -zipToNotStrip $< $@ $< $(call reverse-list,$(PRIVATE_STATIC_JAVA_LIBRARIES))
 
+#######################################
+LOCAL_JETIFIER_INPUT_FILE := $(full_classes_combined_jar)
+
+include $(BUILD_SYSTEM)/jetifier.mk
+#######################################
+
 # Run jarjar if necessary, otherwise just copy the file.
 ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
 $(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)
-$(full_classes_jarjar_jar): $(full_classes_combined_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)
+$(full_classes_jarjar_jar): $(LOCAL_JETIFIER_OUTPUT_FILE) $(LOCAL_JARJAR_RULES) | $(JARJAR)
 	@echo JarJar: $@
 	$(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@
 else
@@ -113,9 +119,9 @@ full_classes_jarjar_jar := $(full_classes_combined_jar)
 endif
 
 
+#######################################
 LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(full_classes_jarjar_jar)
 
-#######################################
 include $(BUILD_SYSTEM)/jacoco.mk
 #######################################
 
diff --git a/core/java.mk b/core/java.mk
index 2f0e3c368..67ed9d10c 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -557,11 +557,17 @@ else
 full_classes_jarjar_jar := $(full_classes_processed_jar)
 endif
 
-$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))
+#######################################
+LOCAL_JETIFIER_INPUT_FILE := $(full_classes_jarjar_jar)
 
-LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(full_classes_jar)
+include $(BUILD_SYSTEM)/jetifier.mk
+#######################################
+
+$(eval $(call copy-one-file,$(LOCAL_JETIFIER_OUTPUT_FILE),$(full_classes_jar)))
 
 #######################################
+LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(full_classes_jar)
+
 include $(BUILD_SYSTEM)/jacoco.mk
 #######################################
 
diff --git a/core/jetifier.mk b/core/jetifier.mk
new file mode 100644
index 000000000..305c9dde4
--- /dev/null
+++ b/core/jetifier.mk
@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This file sets up the running of Jetifier
+
+# now add the rule to run jetifier
+ifeq ($(strip $(LOCAL_JETIFIER_ENABLED)),true)
+  my_jetifier_input_path := $(LOCAL_JETIFIER_INPUT_FILE)
+  my_files := $(intermediates.COMMON)/jetifier
+  my_jetifier_output_path := $(my_files)/classes-jetifier.jar
+
+$(my_jetifier_output_path) : $(my_jetifier_input_path) $(JETIFIER)
+	rm -rf $@
+	$(JETIFIER) -outputfile $@ -i $<
+
+  LOCAL_JETIFIER_OUTPUT_FILE := $(my_jetifier_output_path)
+  LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_JETIFIER_OUTPUT_FILE)
+else
+  LOCAL_JETIFIER_OUTPUT_FILE := $(LOCAL_JETIFIER_INPUT_FILE)
+endif
+