Merge "Remove mainDexClasses" am: 35035f0682 am: abbf25246d am: 972714a198 am: b4579e99da am: f24612c1d4

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1833067

Change-Id: I3ad3df4aee223a28bbb89e445295f873725dbfa1

2 files changed, 0 insertions, 161 deletions

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 3d23f5470..000000000
--- a/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2006 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.
-
-LOCAL_PATH := $(call my-dir)
-
-subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
-		dx \
-	))
-
-include $(subdirs)
-
-
-.PHONY: dex dex-debug
-ifeq ($(DONT_INSTALL_DEX_FILES),true)
-dex:
-	@echo "Forcing a remake with DONT_INSTALL_DEX_FILES=false"
-	$(hide) $(MAKE) DONT_INSTALL_DEX_FILES=false
-else
-# DONT_INSTALL_DEX_FILES is already false, so a normal make takes care of it.
-dex: $(DEFAULT_GOAL)
-endif
-
-d :=
-ifneq ($(GENERATE_DEX_DEBUG),)
-d := debug
-endif
-ifneq ($(DONT_INSTALL_DEX_FILES),true)
-d := $(d)-install
-endif
-ifneq ($(d),debug-install)
-# generate the debug .dex files, with a copy in ./dalvik/DEBUG-FILES.
-# We need to rebuild the .dex files for the debug output to be generated.
-# The "touch -c $(DX)" is a hack that we know will force
-# a rebuild of the .dex files.  If $(DX) doesn't exist yet,
-# we won't touch it (-c) and the normal build will create
-# the .dex files naturally.
-dex-debug:
-	@echo "Forcing an app rebuild with GENERATE_DEX_DEBUG=true"
-	@touch -c $(DX)
-	$(hide) $(MAKE) DONT_INSTALL_DEX_FILES=false GENERATE_DEX_DEBUG=true
-else
-# GENERATE_DEX_DEBUG and DONT_INSTALL_DEX_FILES are already set properly,
-# so a normal make takes care of it.
-dex-debug: $(DEFAULT_GOAL)
-endif
diff --git a/dx/Android.mk b/dx/Android.mk
deleted file mode 100644
index 09ccce12a..000000000
--- a/dx/Android.mk
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-#
-LOCAL_PATH := $(call my-dir)
-
-# We use copy-file-to-new-target so that the installed
-# script files' timestamps are at least as new as the
-# .jar files they wrap.
-
-# This tool is prebuilt if we're doing an app-only build.
-ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
-
-# the mainDexClasses rules
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := mainDexClasses.rules
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/dx$(COMMON_JAVA_PACKAGE_SUFFIX)
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/mainDexClasses.rules | $(ACP)
-	@echo "Copy: $(PRIVATE_MODULE) ($@)"
-	$(copy-file-to-new-target)
-
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-
-installed_mainDexClasses.rules := $(LOCAL_INSTALLED_MODULE)
-
-# the mainDexClassesNoAapt rules
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := mainDexClassesNoAapt.rules
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/dx$(COMMON_JAVA_PACKAGE_SUFFIX)
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/mainDexClassesNoAapt.rules | $(ACP)
-	@echo "Copy: $(PRIVATE_MODULE) ($@)"
-	$(copy-file-to-new-target)
-
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-
-installed_mainDexClassesNoAapt.rules := $(LOCAL_INSTALLED_MODULE)
-
-# the shrinkedAndroid jar is a library used by the mainDexClasses script
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := shrinkedAndroid
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-LOCAL_BUILT_MODULE_STEM := shrinkedAndroid.jar
-LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): PRIVATE_PROGUARD_FLAGS:= \
-  -include $(addprefix $(LOCAL_PATH)/, shrinkedAndroid.proguard.flags)
-$(LOCAL_BUILT_MODULE): $(call java-lib-files,$(call resolve-prebuilt-sdk-module,20)) \
-                       $(addprefix $(LOCAL_PATH)/, shrinkedAndroid.proguard.flags)| $(PROGUARD)
-	@echo Proguard: $@
-	$(hide) $(PROGUARD) -injars "$<(**/*.class)" -outjars $@ $(PRIVATE_PROGUARD_FLAGS)
-
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-
-installed_shrinkedAndroid := $(LOCAL_INSTALLED_MODULE)
-
-# the mainDexClasses script
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := mainDexClasses
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/dx$(COMMON_JAVA_PACKAGE_SUFFIX)
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/mainDexClasses | $(ACP)
-	@echo "Copy: $(PRIVATE_MODULE) ($@)"
-	$(copy-file-to-new-target)
-	$(hide) chmod 755 $@
-
-$(LOCAL_INSTALLED_MODULE): | $(installed_shrinkedAndroid) $(installed_mainDexClasses.rules) \
-                             $(installed_mainDexClassesNoAapt.rules)
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-
-endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK