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

am b541ab6c: Support to build 64-bit unbundled binaries.

Browse Source 
* commit 'b541ab6c51734530ed615e307f8912f32e616967':
  Support to build 64-bit unbundled binaries.
This commit is contained in:
Ying Wang
2014-05-30 01:02:44 +00:00
committed by Android Git Automerger
parent 9e4dbb5a16 b541ab6c51
commit 21e9474252
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
envsetup.sh
View File

@@ -2,7 +2,7 @@ function hmm() {
cat <<EOF cat <<EOF
Invoke ". build/envsetup.sh" from your shell to add the following functions to your environment: Invoke ". build/envsetup.sh" from your shell to add the following functions to your environment:
- lunch: lunch <product_name>-<build_variant> - lunch: lunch <product_name>-<build_variant>
- tapas: tapas [<App1> <App2> ...] [arm|x86|mips|armv5] [eng|userdebug|user] - tapas: tapas [<App1> <App2> ...] [arm|x86|mips|armv5|arm64|x86_64|mips64] [eng|userdebug|user]
- croot: Changes directory to the top of the tree. - croot: Changes directory to the top of the tree.
- m: Makes from 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. - mm: Builds all of the modules in the current directory, but not their dependencies.
@@ -590,9 +590,9 @@ complete -F _lunch lunch
# Run tapas with one or more app names (from LOCAL_PACKAGE_NAME) # Run tapas with one or more app names (from LOCAL_PACKAGE_NAME)
function tapas() function tapas()
{ {
local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|mips|armv5)$' | xargs)" local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|mips|armv5|arm64|x86_64|mips64)$' | xargs)"
local variant="$(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$' | 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|mips|armv5)$' | xargs)" local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|mips|armv5|arm64|x86_64|mips64)$' | xargs)"
if [ $(echo $arch | wc -w) -gt 1 ]; then if [ $(echo $arch | wc -w) -gt 1 ]; then
echo "tapas: Error: Multiple build archs supplied: $arch" echo "tapas: Error: Multiple build archs supplied: $arch"
@@ -605,9 +605,12 @@ function tapas()
local product=full local product=full
case $arch in case $arch in
x86) product=full_x86;; x86) product=full_x86;;
mips) product=full_mips;; mips) product=full_mips;;
armv5) product=generic_armv5;; armv5) product=generic_armv5;;
arm64) product=aosp_arm64;;
x86_64) product=aosp_x86_64;;
mips64) product=aosp_mips64;;
esac esac
if [ -z "$variant" ]; then if [ -z "$variant" ]; then
variant=eng variant=eng

3
target/product/AndroidProducts.mk
View File

@@ -42,7 +42,8 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_mips.mk \ $(LOCAL_DIR)/aosp_mips.mk \
$(LOCAL_DIR)/full_mips.mk \ $(LOCAL_DIR)/full_mips.mk \
$(LOCAL_DIR)/aosp_arm64.mk \ $(LOCAL_DIR)/aosp_arm64.mk \
$(LOCAL_DIR)/aosp_mips64.mk $(LOCAL_DIR)/aosp_mips64.mk \
$(LOCAL_DIR)/aosp_x86_64.mk
else else
PRODUCT_MAKEFILES := \ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \ $(LOCAL_DIR)/core.mk \