StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge the module_* device.mk files into their corresponding product mk files." am: c7e1bdfede am: 2e6a0e59d4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1570300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4129d79288e06bd28cb92e052c2e94db98761ebc
This commit is contained in:
Martin Stjernholm
2021-02-03 17:12:54 +00:00
committed by Automerger Merge Worker
parent 9d5f3395e6 2e6a0e59d4
commit 4e3ba6b5c8
8 changed files with 9 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
target/board/module_arm64/device.mk
View File

@@ -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/default_art_config.mk)
$(call inherit-product, build/make/target/product/core_64_bit.mk)
$(call inherit-product, build/make/target/product/languages_default.mk)

18
target/board/module_x86/device.mk
View File

@@ -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/default_art_config.mk)
$(call inherit-product, build/make/target/product/languages_default.mk)

19
target/board/module_x86_64/device.mk
View File

@@ -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/default_art_config.mk)
$(call inherit-product, build/make/target/product/core_64_bit.mk)
$(call inherit-product, build/make/target/product/languages_default.mk)

2
target/product/module_arm.mk
View File

@@ -14,7 +14,7 @@
# limitations under the License.
#
$(call inherit-product, $(SRC_TARGET_DIR)/board/module_arm/device.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
PRODUCT_NAME := module_arm
PRODUCT_BRAND := Android

3
target/product/module_arm64.mk
View File

@@ -14,7 +14,8 @@
# limitations under the License.
#
$(call inherit-product, $(SRC_TARGET_DIR)/board/module_arm64/device.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
PRODUCT_NAME := module_arm64
PRODUCT_BRAND := Android

6
target/board/module_arm/device.mk → target/product/module_common.mk
View File

@@ -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/default_art_config.mk)
$(call inherit-product, build/make/target/product/languages_default.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)

2
target/product/module_x86.mk
View File

@@ -14,7 +14,7 @@
# limitations under the License.
#
$(call inherit-product, $(SRC_TARGET_DIR)/board/module_x86/device.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
PRODUCT_NAME := module_x86
PRODUCT_BRAND := Android

3
target/product/module_x86_64.mk
View File

@@ -14,7 +14,8 @@
# limitations under the License.
#
$(call inherit-product, $(SRC_TARGET_DIR)/board/module_x86_64/device.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
PRODUCT_NAME := module_x86_64
PRODUCT_BRAND := Android