Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7e1bdfe authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Merge the module_* device.mk files into their corresponding product mk files."

parents 1d77ebad 4ca749cb

target/board/module_arm64/device.mk

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
#

# 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)

target/board/module_x86/device.mk

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
#

# 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)

target/board/module_x86_64/device.mk

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
#

# 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)

target/product/module_arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/product/module_arm64.mk

+2 −1
Original line number Diff line number Diff line
@@ -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