Merge "Convert MultiDexLegacy* tests to Android.bp and d8 --main-dex-rules" (58210e29) · Commits · e / os / android_frameworks_base

core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.bp

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2014 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.

		package {
		default_applicable_licenses: ["frameworks_base_license"],
		}

		// The application with a minimal main dex
		android_test_helper_app {
		name: "MultiDexLegacyAndException",

		static_libs: [
		"android-support-multidex",
		"android-support-multidex-instrumentation",
		"androidx.test.rules",
		],

		srcs: ["src/*/.java"],

		sdk_version: "16",

		javacflags: ["-nowarn"],

		main_dex_rules: [":mainDexClassesRules"],
		dxflags: [
		// --debug triggers the old --minimal-main-dex behavior
		"--debug",
		],
		optimize: {
		// disable optimization to force D8 instead of R8, as R8 doesn't support
		// --main-dex-rules.
		enabled: false,
		},

		min_sdk_version: "16",
		}

core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk

deleted100644 → 0

+0 −51

Original line number	Diff line number	Diff line
		# Copyright (C) 2014 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)


		## The application with a minimal main dex
		include $(CLEAR_VARS)

		LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex android-support-multidex-instrumentation androidx.test.rules
		LOCAL_MODULE_TAGS := tests

		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_SDK_VERSION := 8

		LOCAL_PACKAGE_NAME := MultiDexLegacyAndException
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE

		LOCAL_DEX_PREOPT := false

		LOCAL_JAVACFLAGS := -nowarn

		mainDexList:= \
		$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

		LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

		LOCAL_MIN_SDK_VERSION := 8

		include $(BUILD_PACKAGE)

		$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)
		$(hide) mkdir -p $(dir $@)
		PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@
		echo "com/android/multidexlegacyandexception/Test.class" >> $@

		$(built_dex_intermediate): $(mainDexList)

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.bp

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2014 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.

		package {
		default_applicable_licenses: ["frameworks_base_license"],
		}

		// The application with a minimal main dex
		android_test_helper_app {
		name: "MultiDexLegacyTestApp",

		static_libs: ["android-support-multidex"],

		srcs: ["src/*/.java"],

		sdk_version: "16",

		main_dex_rules: [
		":mainDexClassesRules",
		"mainDexClasses.rules",
		],
		dxflags: [
		// --debug triggers the old --minimal-main-dex behavior
		"--debug",
		],
		optimize: {
		// disable optimization to force D8 instead of R8, as R8 doesn't support
		// --main-dex-rules.
		enabled: false,
		},

		min_sdk_version: "16",
		}

		android_test_helper_app {
		name: "MultiDexLegacyTestApp2",

		static_libs: ["android-support-multidex"],

		srcs: ["src/*/.java"],

		sdk_version: "16",

		main_dex_rules: [
		":mainDexClassesRules",
		"mainDexClasses.rules",
		],
		dxflags: [
		// --release disables the old --minimal-main-dex behavior
		"--release",
		],
		optimize: {
		// disable optimization to force D8 instead of R8, as R8 doesn't support
		// --main-dex-rules.
		enabled: false,
		},

		min_sdk_version: "16",
		}

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk

deleted100644 → 0

+0 −87

Original line number	Diff line number	Diff line
		# Copyright (C) 2014 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)


		## The application with a minimal main dex
		include $(CLEAR_VARS)

		LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex
		LOCAL_MODULE_TAGS := tests

		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_SDK_VERSION := 8

		LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE

		LOCAL_DEX_PREOPT := false

		LOCAL_EMMA_INSTRUMENT := false

		mainDexList:= \
		$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

		LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

		LOCAL_MIN_SDK_VERSION := 8

		include $(BUILD_PACKAGE)

		$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)
		$(hide) mkdir -p $(dir $@)
		PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@
		echo "com/android/multidexlegacytestapp/Test.class" >> $@

		$(built_dex_intermediate): $(mainDexList)

		## The application with a full main dex
		include $(CLEAR_VARS)

		LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex

		LOCAL_MODULE_TAGS := tests

		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_SDK_VERSION := 8

		LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp2
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE

		LOCAL_DEX_PREOPT := false

		LOCAL_EMMA_INSTRUMENT := false

		mainDexList2:= \
		$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

		LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList2)

		LOCAL_MIN_SDK_VERSION := 8

		include $(BUILD_PACKAGE)

		$(mainDexList2): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)
		$(hide) mkdir -p $(dir $@)
		PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@
		echo "com/android/multidexlegacytestapp/Test.class" >> $@

		$(built_dex_intermediate): $(mainDexList2)

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/mainDexClasses.rules

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		-keep class com.android.multidexlegacytestapp.Test