diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-19 23:47:52 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-19 23:47:52 +0000 |
commit | f869ee382a3ed2bec072e56cb3bb25e707ca16c4 (patch) | |
tree | a250fc7422c9b72776af99eaf1ee98f753310c6c | |
parent | 9eadbbfc777ab11887e7cbc3a338a1e189834110 (diff) | |
parent | bb56b5d42fbf966232b41fbca1393411fdf03c7f (diff) | |
download | build-f869ee382a3ed2bec072e56cb3bb25e707ca16c4.tar.gz |
Merge cherrypicks of [14241638, 14241639, 14241695] into mainline-media-swcodec-releaseandroid-mainline-11.0.0_r40android11-mainline-media-swcodec-release
Change-Id: I8ed164e03a7973359c4ee05c28c25f2e52fcc754
-rw-r--r-- | target/board/module_arm64/device.mk | 19 | ||||
-rw-r--r-- | target/board/module_x86/device.mk | 18 | ||||
-rw-r--r-- | target/board/module_x86_64/device.mk | 19 | ||||
-rw-r--r-- | target/product/module_arm.mk | 3 | ||||
-rw-r--r-- | target/product/module_arm64.mk | 3 | ||||
-rw-r--r-- | target/product/module_common.mk (renamed from target/board/module_arm/device.mk) | 6 | ||||
-rw-r--r-- | target/product/module_x86.mk | 3 | ||||
-rw-r--r-- | target/product/module_x86_64.mk | 3 |
8 files changed, 7 insertions, 67 deletions
diff --git a/target/board/module_arm64/device.mk b/target/board/module_arm64/device.mk deleted file mode 100644 index 9065d4b66d..0000000000 --- a/target/board/module_arm64/device.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2020 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. -# - -$(call inherit-product, build/make/target/product/bootclasspath.mk) -$(call inherit-product, build/make/target/product/core_64_bit.mk) -$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_x86/device.mk b/target/board/module_x86/device.mk deleted file mode 100644 index 7cac5f8430..0000000000 --- a/target/board/module_x86/device.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2020 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. -# - -$(call inherit-product, build/make/target/product/bootclasspath.mk) -$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_x86_64/device.mk b/target/board/module_x86_64/device.mk deleted file mode 100644 index 9065d4b66d..0000000000 --- a/target/board/module_x86_64/device.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2020 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. -# - -$(call inherit-product, build/make/target/product/bootclasspath.mk) -$(call inherit-product, build/make/target/product/core_64_bit.mk) -$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/product/module_arm.mk b/target/product/module_arm.mk index 09ccf5fa0d..0deb43df93 100644 --- a/target/product/module_arm.mk +++ b/target/product/module_arm.mk @@ -14,8 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/board/module_arm/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk) PRODUCT_NAME := module_arm PRODUCT_BRAND := Android -PRODUCT_DEVICE := module_arm diff --git a/target/product/module_arm64.mk b/target/product/module_arm64.mk index 468c9db9a5..8effa785a9 100644 --- a/target/product/module_arm64.mk +++ b/target/product/module_arm64.mk @@ -14,8 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/board/module_arm64/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk) PRODUCT_NAME := module_arm64 PRODUCT_BRAND := Android -PRODUCT_DEVICE := module_arm64 diff --git a/target/board/module_arm/device.mk b/target/product/module_common.mk index 7cac5f8430..eb8f92c5e8 100644 --- a/target/board/module_arm/device.mk +++ b/target/product/module_common.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 The Android Open Source Project +# Copyright (C) 2021 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. @@ -14,5 +14,5 @@ # limitations under the License. # -$(call inherit-product, build/make/target/product/bootclasspath.mk) -$(call inherit-product, build/make/target/product/languages_default.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/bootclasspath.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk) diff --git a/target/product/module_x86.mk b/target/product/module_x86.mk index dec4aedca0..5f75c82b55 100644 --- a/target/product/module_x86.mk +++ b/target/product/module_x86.mk @@ -14,8 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/board/module_x86/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk) PRODUCT_NAME := module_x86 PRODUCT_BRAND := Android -PRODUCT_DEVICE := module_x86 diff --git a/target/product/module_x86_64.mk b/target/product/module_x86_64.mk index 5fabade708..9196cd2503 100644 --- a/target/product/module_x86_64.mk +++ b/target/product/module_x86_64.mk @@ -14,8 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/board/module_x86_64/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk) PRODUCT_NAME := module_x86_64 PRODUCT_BRAND := Android -PRODUCT_DEVICE := module_x86_64 |