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

Commit 6270916e authored by Ulya Trofimovich's avatar Ulya Trofimovich Committed by Automerger Merge Worker
Browse files

Merge "Add riscv64 banchan target." am: 40b9ac7e 

Original change: https://android-review.googlesource.com/c/platform/build/+/2622111



Change-Id: Id99f370918459dd7e4cc445b419c56c5017ae3e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e911b7cf 40b9ac7e

envsetup.sh

+5 −4
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y 
              invocations of 'm' etc.

- tapas:      tapas [<App1> <App2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user]

              Sets up the build environment for building unbundled apps (APKs).

- banchan:    banchan <module1> [<module2> ...] [arm|x86|arm64|x86_64|arm64_only|x86_64only] \

                      [eng|userdebug|user]

- banchan:    banchan <module1> [<module2> ...] \

                      [arm|x86|arm64|riscv64|x86_64|arm64_only|x86_64only] [eng|userdebug|user]

              Sets up the build environment for building unbundled modules (APEXes).

- croot:      Changes directory to the top of the tree, or a subdirectory thereof.

- m:          Makes from the top of the tree.
@@ -952,9 +952,9 @@ function tapas() 
function banchan()

{

    local showHelp="$(echo $* | xargs -n 1 echo | \grep -E '^(help)$' | xargs)"

    local product="$(echo $* | xargs -n 1 echo | \grep -E '^(.*_)?(arm|x86|arm64|x86_64|arm64only|x86_64only)$' | xargs)"

    local product="$(echo $* | xargs -n 1 echo | \grep -E '^(.*_)?(arm|x86|arm64|riscv64|x86_64|arm64only|x86_64only)$' | xargs)"

    local variant="$(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$' | xargs)"

    local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|(.*_)?(arm|x86|arm64|x86_64))$' | xargs)"

    local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|(.*_)?(arm|x86|arm64|riscv64|x86_64))$' | xargs)"



    if [ "$showHelp" != "" ]; then

      $(gettop)/build/make/banchanHelp.sh
@@ -980,6 +980,7 @@ function banchan() 
      arm)    product=module_arm;;

      x86)    product=module_x86;;

      arm64)  product=module_arm64;;

      riscv64) product=module_riscv64;;

      x86_64) product=module_x86_64;;

      arm64only)  product=module_arm64only;;

      x86_64only) product=module_x86_64only;;

target/board/module_riscv64/BoardConfig.mk

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# Copyright (C) 2023 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.

#



TARGET_ARCH := riscv64

TARGET_ARCH_VARIANT :=

TARGET_CPU_VARIANT := generic

TARGET_CPU_ABI := riscv64



# Temporary hack while prebuilt modules are missing riscv64.

ALLOW_MISSING_DEPENDENCIES := true

target/board/module_riscv64/README.md

0 → 100644
+2 −0
Original line number Diff line number Diff line 
This device is suitable for an unbundled module targeted specifically to a

riscv64 device. This is a 64-bit only device (no 32-bit support).

target/product/AndroidProducts.mk

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ PRODUCT_MAKEFILES += \ 
    $(LOCAL_DIR)/module_arm.mk \

    $(LOCAL_DIR)/module_arm64.mk \

    $(LOCAL_DIR)/module_arm64only.mk \

    $(LOCAL_DIR)/module_riscv64.mk \

    $(LOCAL_DIR)/module_x86.mk \

    $(LOCAL_DIR)/module_x86_64.mk \

    $(LOCAL_DIR)/module_x86_64only.mk \

target/product/module_riscv64.mk

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2023 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, $(SRC_TARGET_DIR)/product/module_common.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)



PRODUCT_NAME := module_riscv64

PRODUCT_DEVICE := module_riscv64