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

Commit 1211033f authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Remove armv5te" 

am: 139f458c

Change-Id: I0879425c32e5af7e7d2b72fa4b780d9b394cdc1b
parents f125a492 139f458c

core/combo/TARGET_linux-arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ ifneq (,$(filter $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT), $(KNOWN_ARMv8_CO 
endif



ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),)

TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te

$(error TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT must be set)

endif



TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT).mk

core/combo/arch/arm/armv5te-vfp.mk

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
# At the moment, use the same settings than the one

# for armv5te, since TARGET_ARCH_VARIANT := armv5te-vfp

# will only be used to select an optimized VFP-capable assembly

# interpreter loop for Dalvik.

#

include $(BUILD_COMBOS)/arch/arm/armv5te.mk

core/combo/arch/arm/armv5te.mk

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
# Configuration for Linux on ARM.

# Generating binaries for the ARMv5TE architecture and higher

#

envsetup.sh

+3 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y 
             Selects <product_name> as the product to build, and <build_variant> as the variant to

             build, and stores those selections in the environment to be read by subsequent

             invocations of 'm' etc.

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

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

- croot:     Changes directory to the top of the tree.

- m:         Makes from the top of the tree.

- mm:        Builds all of the modules in the current directory, but not their dependencies.
@@ -661,10 +661,10 @@ complete -F _lunch lunch 
function tapas()

{

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

    local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|mips|armv5|arm64|x86_64|mips64)$' | xargs)"

    local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|mips|arm64|x86_64|mips64)$' | xargs)"

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

    local density="$(echo $* | xargs -n 1 echo | \grep -E '^(ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)"

    local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|mips|armv5|arm64|x86_64|mips64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)"

    local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|mips|arm64|x86_64|mips64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)"



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

      $(gettop)/build/make/tapasHelp.sh
@@ -688,7 +688,6 @@ function tapas() 
    case $arch in

      x86)    product=aosp_x86;;

      mips)   product=aosp_mips;;

      armv5)  product=generic_armv5;;

      arm64)  product=aosp_arm64;;

      x86_64) product=aosp_x86_64;;

      mips64)  product=aosp_mips64;;

tapasHelp.sh

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ SCRIPT_DIR="${PWD}" 
cd ../..

TOP="${PWD}"



message='usage: tapas [<App1> <App2> ...] [arm|x86|mips|armv5|arm64|x86_64|mips64] [eng|userdebug|user]

message='usage: tapas [<App1> <App2> ...] [arm|x86|mips|arm64|x86_64|mips64] [eng|userdebug|user]



tapas selects individual apps to be built by the Android build system. Unlike

"lunch", "tapas" does not request the building of images for a device.