diff options
25 files changed, 450 insertions, 518 deletions
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.bp new file mode 100644 index 000000000000..d0645b0d8b12 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.bp @@ -0,0 +1,47 @@ +// 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", +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk deleted file mode 100644 index 2d8556f2a3c7..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk +++ /dev/null @@ -1,51 +0,0 @@ -# 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) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.bp new file mode 100644 index 000000000000..c0c8aba2d2f0 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.bp @@ -0,0 +1,70 @@ +// 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", +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk deleted file mode 100644 index d7af2d9c3cfe..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk +++ /dev/null @@ -1,87 +0,0 @@ -# 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) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/mainDexClasses.rules b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/mainDexClasses.rules new file mode 100644 index 000000000000..91e6ddbb74c7 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/mainDexClasses.rules @@ -0,0 +1 @@ +-keep class com.android.multidexlegacytestapp.Test diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.bp new file mode 100644 index 000000000000..fe294168586d --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.bp @@ -0,0 +1,34 @@ +// 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 { + name: "MultiDexLegacyTestAppTests", + + static_libs: ["android-support-multidex-instrumentation"], + + srcs: ["src/**/*.java"], + + sdk_version: "16", + + javacflags: ["-nowarn"], + + min_sdk_version: "16", + + instrumentation_for: "MultiDexLegacyTestApp", +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.mk deleted file mode 100644 index 236c7403aa8c..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.mk +++ /dev/null @@ -1,43 +0,0 @@ -# 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-instrumentation -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_SDK_VERSION := 8 - -LOCAL_PACKAGE_NAME := MultiDexLegacyTestAppTests -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 - -LOCAL_MIN_SDK_VERSION := 8 - -LOCAL_INSTRUMENTATION_FOR := MultiDexLegacyTestApp - -LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.dex.output.multidex.legacy=true - -include $(BUILD_PACKAGE) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.bp new file mode 100644 index 000000000000..c558153c6a4e --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.bp @@ -0,0 +1,57 @@ +// 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 tests with only one dex +android_test { + name: "MultiDexLegacyTestAppTests2", + + static_libs: [ + "android-support-multidex-instrumentation", + "androidx.test.rules", + ], + + srcs: ["src/**/*.java"], + + sdk_version: "16", + + javacflags: ["-nowarn"], + + min_sdk_version: "16", + + instrumentation_for: "MultiDexLegacyTestApp", +} + +// The tests with a minimal main dex +android_test { + name: "MultiDexLegacyTestAppTests2-multidex", + + static_libs: [ + "android-support-multidex-instrumentation", + "androidx.test.rules", + ], + + srcs: ["src/**/*.java"], + + sdk_version: "16", + + javacflags: ["-nowarn"], + + min_sdk_version: "16", + + instrumentation_for: "MultiDexLegacyTestApp", +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk deleted file mode 100644 index 6f6ccfe8dee7..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk +++ /dev/null @@ -1,69 +0,0 @@ -# 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 tests with only one dex -include $(CLEAR_VARS) - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex-instrumentation androidx.test.rules -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_SDK_VERSION := current - -LOCAL_PACKAGE_NAME := MultiDexLegacyTestAppTests2 -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 - -LOCAL_MIN_SDK_VERSION := 8 - -LOCAL_INSTRUMENTATION_FOR := MultiDexLegacyTestApp - -include $(BUILD_PACKAGE) - - -## The tests with a minimal main dex -include $(CLEAR_VARS) - -LOCAL_STATIC_JAVA_LIBRARIES := 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 := MultiDexLegacyTestAppTests2-multidex -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 - -LOCAL_MIN_SDK_VERSION := 8 - -LOCAL_INSTRUMENTATION_FOR := MultiDexLegacyTestApp - -LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.dex.output.multidex.legacy=true - -include $(BUILD_PACKAGE) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.bp new file mode 100644 index 000000000000..15bc4efbd480 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.bp @@ -0,0 +1,48 @@ +// 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"], +} + +android_test_helper_app { + name: "MultiDexLegacyTestApp_without_corrupted", + + srcs: ["src/**/*.java"], + + sdk_version: "16", + + static_libs: ["android-support-multidex"], +} + +java_genrule { + name: "MultiDexLegacyTestApp_genrule", + srcs: [ + ":MultiDexLegacyTestApp_without_corrupted", + ], + tools: [ + "soong_zip", + "merge_zips", + ], + out: ["MultiDexLegacyTestApp_with_corrupted.apk"], + cmd: "touch $(genDir)/classes2.dex &&" + + " $(location soong_zip) -o $(genDir)/corrupted.zip -j -f $(genDir)/classes2.dex &&" + + " $(location merge_zips) $(out) $(location :MultiDexLegacyTestApp_without_corrupted) $(genDir)/corrupted.zip", +} + +android_test_import { + name: "MultiDexLegacyTestApp_corrupted", + apk: ":MultiDexLegacyTestApp_genrule", + default_dev_cert: true, +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.mk deleted file mode 100644 index 33a46ea980c1..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -# 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) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_SDK_VERSION := 18 - -LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp_corrupted -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex - -LOCAL_DEX_PREOPT := false - -include $(BUILD_PACKAGE) - -corrupted_classes2_dex := $(dir $(built_dex))/classes2.dex - -$(corrupted_classes2_dex): $(built_dex) - $(hide) touch $@ - -$(LOCAL_BUILT_MODULE): $(corrupted_classes2_dex) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.bp new file mode 100644 index 000000000000..de0657fc3957 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.bp @@ -0,0 +1,38 @@ +// 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"], +} + +android_test { + name: "MultiDexLegacyTestServices", + + srcs: ["src/**/*.java"], + + sdk_version: "16", + + static_libs: ["android-support-multidex"], + + 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, + }, +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk deleted file mode 100644 index efc06886bee4..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk +++ /dev/null @@ -1,47 +0,0 @@ -# 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) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_SDK_VERSION := 9 - -LOCAL_PACKAGE_NAME := MultiDexLegacyTestServices -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex - -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_DEX_PREOPT := false - -LOCAL_EMMA_INSTRUMENT := false - -include $(BUILD_PACKAGE) - -$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS) - $(hide) mkdir -p $(dir $@) - PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@ - -$(built_dex_intermediate): $(mainDexList) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp index 56f10fe075ed..b62b25c080fb 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.bp @@ -24,7 +24,7 @@ package { android_test { name: "MultiDexLegacyTestServicesTests", srcs: ["src/**/*.java"], - sdk_version: "9", + sdk_version: "16", dex_preopt: { enabled: false, }, diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.bp new file mode 100644 index 000000000000..75c753cef0fd --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.bp @@ -0,0 +1,28 @@ +// 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"], +} + +android_test { + name: "MultiDexLegacyTestServicesTests2", + + srcs: ["src/**/*.java"], + + libs: ["android-support-multidex"], + static_libs: ["androidx.test.rules"], + + sdk_version: "16", +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.mk deleted file mode 100644 index 3920fd64b03e..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# 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) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := MultiDexLegacyTestServicesTests2 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE - -LOCAL_JAVA_LIBRARIES := android-support-multidex -LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules - -LOCAL_SDK_VERSION := 9 - -LOCAL_DEX_PREOPT := false - -include $(BUILD_PACKAGE) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.bp new file mode 100644 index 000000000000..23c62dc352c5 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.bp @@ -0,0 +1,41 @@ +// 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"], +} + +android_test_helper_app { + name: "MultiDexLegacyVersionedTestApp_v1", + + srcs: ["src/**/*.java"], + + sdk_version: "16", + + static_libs: ["android-support-multidex"], + + 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, + }, +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk deleted file mode 100644 index 2323ad98ac3d..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk +++ /dev/null @@ -1,48 +0,0 @@ -# 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) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_SDK_VERSION := 9 - -LOCAL_PACKAGE_NAME := MultiDexLegacyVersionedTestApp_v1 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex - -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 - -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/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ - -$(built_dex_intermediate): $(mainDexList) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/mainDexClasses.rules b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/mainDexClasses.rules new file mode 100644 index 000000000000..1cdf3af798d3 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/mainDexClasses.rules @@ -0,0 +1 @@ +-keep class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.bp new file mode 100644 index 000000000000..6cd3df71ddf4 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.bp @@ -0,0 +1,41 @@ +// 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"], +} + +android_test_helper_app { + name: "MultiDexLegacyVersionedTestApp_v2", + + srcs: ["src/**/*.java"], + + sdk_version: "16", + + static_libs: ["android-support-multidex"], + + 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, + }, +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk deleted file mode 100644 index 79a59063f702..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk +++ /dev/null @@ -1,48 +0,0 @@ -# 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) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_SDK_VERSION := 9 - -LOCAL_PACKAGE_NAME := MultiDexLegacyVersionedTestApp_v2 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex - -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 - -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/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ - -$(built_dex_intermediate): $(mainDexList) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/mainDexClasses.rules b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/mainDexClasses.rules new file mode 100644 index 000000000000..1cdf3af798d3 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/mainDexClasses.rules @@ -0,0 +1 @@ +-keep class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.bp b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.bp new file mode 100644 index 000000000000..34dba4013aa3 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.bp @@ -0,0 +1,41 @@ +// 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"], +} + +android_test_helper_app { + name: "MultiDexLegacyVersionedTestApp_v3", + + srcs: ["src/**/*.java"], + + sdk_version: "16", + + static_libs: ["android-support-multidex"], + + 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, + }, +} diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk deleted file mode 100644 index 521bad058693..000000000000 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk +++ /dev/null @@ -1,48 +0,0 @@ -# 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) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_SDK_VERSION := 9 - -LOCAL_PACKAGE_NAME := MultiDexLegacyVersionedTestApp_v3 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex - -mainDexList:= \ - $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list - -LOCAL_DEX_PREOPT := false - -LOCAL_EMMA_INSTRUMENT := false - -LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex - -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/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ - -$(built_dex_intermediate): $(mainDexList) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/mainDexClasses.rules b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/mainDexClasses.rules new file mode 100644 index 000000000000..1cdf3af798d3 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/mainDexClasses.rules @@ -0,0 +1 @@ +-keep class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest |