From 3f434c4083978aa3384da5358d0adc94e6185c96 Mon Sep 17 00:00:00 2001 From: Yuntao Xu Date: Thu, 29 Apr 2021 22:47:32 -0700 Subject: [PATCH] Convert ShortcutSample/Android.mk to Android.bp Convert the Make file to a Soong one Bug: 186778349 Test: compared the results built by Make and Soong Test: TreeHugger Change-Id: I8613fbebc139dcf0f398f048e5716f126e987707 --- samples/ShortcutSample/Android.bp | 104 ++++++++++++++++++++ samples/ShortcutSample/Android.mk | 151 ------------------------------ 2 files changed, 104 insertions(+), 151 deletions(-) create mode 100644 samples/ShortcutSample/Android.bp delete mode 100644 samples/ShortcutSample/Android.mk diff --git a/samples/ShortcutSample/Android.bp b/samples/ShortcutSample/Android.bp new file mode 100644 index 000000000..84774152c --- /dev/null +++ b/samples/ShortcutSample/Android.bp @@ -0,0 +1,104 @@ +// +// Copyright (C) 2016 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 { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +// For testing, we build multiple apk files with different versions. + +//============================================================================ +// Base version (10) +//============================================================================ + +android_test { + name: "ShortcutSample", + aaptflags: [ + "--version-code", + "10", + ], + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + static_libs: ["androidx.legacy_legacy-support-v4"], + sdk_version: "current", +} + +//============================================================================ +// Version 11. +//============================================================================ + +android_test { + name: "ShortcutSample11", + aaptflags: [ + "--version-code", + "11", + ], + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + static_libs: ["androidx.legacy_legacy-support-v4"], + sdk_version: "current", +} + +//============================================================================ +// Version 12. +//============================================================================ + +android_test { + name: "ShortcutSample12", + aaptflags: [ + "--version-code", + "12", + ], + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + static_libs: ["androidx.legacy_legacy-support-v4"], + sdk_version: "current", +} + +//============================================================================ +// Version 11, backup disabled. +//============================================================================ + +android_test { + name: "ShortcutSample11nb", + aaptflags: [ + "--version-code", + "11", + ], + manifest: "noback/AndroidManifest.xml", + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + static_libs: ["androidx.legacy_legacy-support-v4"], + sdk_version: "current", +} + +//============================================================================ +// Version 12, backup disabled. +//============================================================================ + +android_test { + name: "ShortcutSample12nb", + aaptflags: [ + "--version-code", + "12", + ], + manifest: "noback/AndroidManifest.xml", + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + static_libs: ["androidx.legacy_legacy-support-v4"], + sdk_version: "current", +} diff --git a/samples/ShortcutSample/Android.mk b/samples/ShortcutSample/Android.mk deleted file mode 100644 index 5463e6915..000000000 --- a/samples/ShortcutSample/Android.mk +++ /dev/null @@ -1,151 +0,0 @@ -# -# Copyright (C) 2016 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. -# - -# For testing, we build multiple apk files with different versions. - -LOCAL_PATH:= $(call my-dir) - -#============================================================================ -# Base version (10) -#============================================================================ - -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_PACKAGE_NAME := ShortcutSample -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -LOCAL_AAPT_FLAGS += --version-code 10 - -LOCAL_MODULE_TAGS := samples tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4 - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) - -#============================================================================ -# Version 11. -#============================================================================ - -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_PACKAGE_NAME := ShortcutSample11 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -LOCAL_AAPT_FLAGS += --version-code 11 - -LOCAL_MODULE_TAGS := samples tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4 - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) - -#============================================================================ -# Version 12. -#============================================================================ - -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_PACKAGE_NAME := ShortcutSample12 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -LOCAL_AAPT_FLAGS += --version-code 12 - -LOCAL_MODULE_TAGS := samples tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4 - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) - -#============================================================================ -# Version 11, backup disabled. -#============================================================================ - -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_PACKAGE_NAME := ShortcutSample11nb -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -LOCAL_AAPT_FLAGS += --version-code 11 -LOCAL_MANIFEST_FILE := noback/AndroidManifest.xml - -LOCAL_MODULE_TAGS := samples tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4 - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) - -#============================================================================ -# Version 12, backup disabled. -#============================================================================ - -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_PACKAGE_NAME := ShortcutSample12nb -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -LOCAL_AAPT_FLAGS += --version-code 12 -LOCAL_MANIFEST_FILE := noback/AndroidManifest.xml - -LOCAL_MODULE_TAGS := samples tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4 - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE)