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

Commit fde506a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Phase out all _a targets"

parents 5ed75d74 b90ffb0f

target/board/generic_arm64_a/BoardConfig.mk

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

# Copyright (C) 2017 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.

#



include build/make/target/board/BoardConfigGsiCommon.mk



TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a

TARGET_CPU_ABI := arm64-v8a

TARGET_CPU_ABI2 :=

TARGET_CPU_VARIANT := generic



TARGET_2ND_ARCH := arm

TARGET_2ND_ARCH_VARIANT := armv8-a

TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_CPU_VARIANT := generic



# This is a non-system-as-root Legacy GSI build target

BOARD_BUILD_SYSTEM_ROOT_IMAGE := false

target/board/generic_arm_a/BoardConfig.mk

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

# Copyright (C) 2017 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.

#



include build/make/target/board/BoardConfigGsiCommon.mk



TARGET_ARCH := arm

TARGET_ARCH_VARIANT := armv7-a-neon

TARGET_CPU_ABI := armeabi-v7a

TARGET_CPU_ABI2 := armeabi

TARGET_CPU_VARIANT := generic



# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch

TARGET_USES_64_BIT_BINDER := false



# This is a non-system-as-root Legacy GSI build target

BOARD_BUILD_SYSTEM_ROOT_IMAGE := false

target/board/generic_x86_64_a/BoardConfig.mk

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

# Copyright (C) 2017 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.

#



include build/make/target/board/BoardConfigGsiCommon.mk



TARGET_CPU_ABI := x86_64

TARGET_ARCH := x86_64

TARGET_ARCH_VARIANT := x86_64



TARGET_2ND_CPU_ABI := x86

TARGET_2ND_ARCH := x86

TARGET_2ND_ARCH_VARIANT := x86_64



# This is a non-system-as-root Legacy GSI build target

BOARD_BUILD_SYSTEM_ROOT_IMAGE := false

target/board/generic_x86_a/BoardConfig.mk

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

# Copyright (C) 2017 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.

#



include build/make/target/board/BoardConfigGsiCommon.mk



TARGET_CPU_ABI := x86

TARGET_ARCH := x86

TARGET_ARCH_VARIANT := x86



# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch

TARGET_USES_64_BIT_BINDER := false



# This is a non-system-as-root Legacy GSI build target

BOARD_BUILD_SYSTEM_ROOT_IMAGE := false

target/product/AndroidProducts.mk

+0 −4
Original line number Diff line number Diff line
@@ -44,16 +44,12 @@ PRODUCT_MAKEFILES := \ 
else

PRODUCT_MAKEFILES := \

    $(LOCAL_DIR)/aosp_arm64_ab.mk \

    $(LOCAL_DIR)/aosp_arm64_a.mk \

    $(LOCAL_DIR)/aosp_arm64.mk \

    $(LOCAL_DIR)/aosp_arm_ab.mk \

    $(LOCAL_DIR)/aosp_arm_a.mk \

    $(LOCAL_DIR)/aosp_arm.mk \

    $(LOCAL_DIR)/aosp_x86_64_ab.mk \

    $(LOCAL_DIR)/aosp_x86_64_a.mk \

    $(LOCAL_DIR)/aosp_x86_64.mk \

    $(LOCAL_DIR)/aosp_x86_ab.mk \

    $(LOCAL_DIR)/aosp_x86_a.mk \

    $(LOCAL_DIR)/aosp_x86_arm.mk \

    $(LOCAL_DIR)/aosp_x86.mk \

    $(LOCAL_DIR)/full.mk \