tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15149 commits 1 branch 0 tags 119 MiB
Commit graph

3760 commits

Author SHA1 Message Date
Ying Wang
d6c4fcabf6 am 732bdb28: Merge "Load compiler environment for a second arch." 
* commit '732bdb28f2e39cf97b22271481b2249b22add87f':
  Load compiler environment for a second arch.
 2014-01-24 13:43:29 -08:00
Colin Cross
6e087a339b build: use correct arm vs thumb arguments for 2nd arch builds 
Set arm_objects_mode and normal_objects_mode when building a
module for arm when it is the 2nd arch.

Change-Id: I5f7df519b6e1dde6cbf92d106681f07a58e1f1f2
 2014-01-24 13:42:01 -08:00
Colin Cross
c3256c770d build: use arm kernel headers for arm 2nd arch builds 
Compiling for arm requires using the arm kernel headers and not
the aarch64 kernel headers.  Add $(combo_2nd_arch_prefix) to get
asm-$(TARGET_2ND_ARCH) when arm is the 2nd arch.

Change-Id: I15270d0ef35e48c034bf4d0d5e35b76f67b2a8e1
 2014-01-24 13:41:00 -08:00
Ying Wang
b8e0185489 Support arch-specific LOCAL_ variables 
With those variables, you can set up different values for TARGET_ARCH
and TARGET_2ND_ARCH.
Also fixed a couple of variables.

Bug: 11654773
Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b

Conflicts:
	core/base_rules.mk
 2014-01-24 13:38:34 -08:00
Ying Wang
5c7fed28f2 Make sure to install the .odex when running "make <module_name>" 
Change-Id: I64195294dad15b7d379d667f4c4738c2808fd384
 2014-01-24 13:37:11 -08:00
Ying Wang
dd814bf8c2 Support to build executables for TARGET_2ND_ARCH 
By default, an executable is built for TARGET_ARCH.
To build it for TARGET_2ND_ARCH in a 64bit product, use:
LOCAL_32BIT_ONLY := true
To skip a module for TARGET_2ND_ARCH, use:
LOCAL_NO_2ND_ARCH := true

Bug: 11654773
Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
 2014-01-24 13:36:30 -08:00
Ying Wang
ec6d6262ac Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources 
Now the RS generated sources are only appended to my_generated_sources.

Bug: 11654773
Change-Id: If8dbf3c08fed0b9945dd32b8c809331c17c4bc85
 2014-01-24 13:35:47 -08:00
Ying Wang
4d2cc665ea Set up rules to build shared libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
 2014-01-24 13:35:30 -08:00
Ying Wang
6ef6519170 Set up rules to build static libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of static_library_internal.mk.
libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a.

Bug: 11654773
Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
 2014-01-24 13:35:09 -08:00
Ying Wang
1d274d2686 Load compiler environment for a second arch. 
This is the first step to build 32-bit libraries in a 64-bit product.
It will work like this:
1) In the product's BoardConfig.mk, define:
TARGET_2ND_ARCH, TARGET_2ND_ARCH_VARIANT, TARGET_2ND_CPU_VARIANT.
The build system uses those variables to set up an additional compiler
environment for the second arch.

2) When parsing Android.mks, the build system sets up rules to build a
module for both the 1st arch and the 2nd arch, unless it's explicitly
asked to skip so.
Android.mk will be adapted if there is additional rule of generating
source files.
The build system will accept arch-specific LOCAL_ variables, such as
LOCAL_CFLAGS_arm, LOCAL_CFLAGS_armv7-a-neon, LOCAL_CFLAGS_cortex-a15,
LOCAL_CFLAGS_aarch64 etc. Modules use such variables to set up build for
various archs at the same time.

3) Install binary of the 2nd arch by adding "<module_name>:32" to
PRODUCT_PACKAGES. All 2nd-arch libraries linked in by "<module_name>:32"
will be installed automatically.

Bug: 11654773
Change-Id: I2df63cd5463a07bf5358bee2a109f8fb9590fe30

Conflicts:
	core/combo/TARGET_linux-arm.mk
 2014-01-24 13:34:26 -08:00
Colin Cross
de89397b16 am 5119fcfc: am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit '5119fcfc2052e9f3a5d4415759fb5bf252d651e8':
  build: rename aarch64 target to arm64
 2014-01-24 20:48:20 +00:00
Colin Cross
5119fcfc20 am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit 'f81cc531b41617b91ef2c46b7f2fb1bf1abb8dc7':
  build: rename aarch64 target to arm64
 2014-01-24 20:45:41 +00:00
Colin Cross
f81cc531b4 am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit 'd5227a833cde624532ec34e8b25c29af001e427f':
  build: rename aarch64 target to arm64
 2014-01-24 12:42:35 -08:00
Colin Cross
4f0eb7d50c build: rename aarch64 target to arm64 
Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
 2014-01-23 22:39:38 -08:00
Ying Wang
4a814d0a69 am a0d68280: am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit 'a0d68280cae16645c2f16aeb6d8f614b76ba94a0':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-22 04:03:13 +00:00
Ying Wang
a0d68280ca am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit 'f5db454865c7b8cff22cc8faaeb5b983f059cb73':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-22 04:00:19 +00:00
Ying Wang
f5db454865 am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 
* commit '62043de346dff2d31c58bc8c002699fc74d1351c':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
 2014-01-21 19:57:41 -08:00
Ying Wang
62043de346 Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 2014-01-22 03:48:59 +00:00
Ying Wang
06b3255118 Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
This reverts commit ca37190711.

Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
 2014-01-22 03:48:27 +00:00
Ying Wang
6e8e82ea58 am 10515519: am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '10515519ee2a3eb50ef3c6054504972fa1bc1e00':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 20:41:21 +00:00
Ying Wang
10515519ee am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '70cc85533dacfaa499f39c417cfd78e3ed922414':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 20:37:50 +00:00
Ying Wang
70cc85533d am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 
* commit '8d1f91fa548c80357fffbdbdd5dcccc3c461c9ec':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
 2014-01-21 12:36:33 -08:00
Ying Wang
8d1f91fa54 Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 2014-01-21 20:31:31 +00:00
Ying Wang
5f95f44268 am 20048318: am aa754868: am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit '20048318cda49fc9412be8fb2349354313090240':
  Add missing paren in "java -version" check
 2014-01-21 20:01:29 +00:00
Ying Wang
20048318cd am aa754868: am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit 'aa7548683bcd254e50cffc5baf00994e58919d64':
  Add missing paren in "java -version" check
 2014-01-21 19:58:09 +00:00
Ying Wang
aa7548683b am 6ec35451: Merge "Add missing paren in "java -version" check" 
* commit '6ec3545158f49f521c53c9474cfb28c1a1811fd3':
  Add missing paren in "java -version" check
 2014-01-21 11:54:58 -08:00
Brian Carlstrom
0cf57dc99f Add missing paren in "java -version" check 
Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
 2014-01-20 23:48:45 -08:00
Robert Craig
ca37190711 Fix filter rule when checking for apks in PRODUCT_COPY_FILES. 
PRODUCT_COPY_FILES entries can include the src:dest:owner
syntax versus src:dest. This causes the filter to miss
certain cases. Instead use the word-colon function to
grab the dest regardless of syntax.

Change-Id: I1f4e57a236c1db148bada0cfe5bd1e87bb1194d6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-01-17 09:13:50 -05:00
Chet Haase
585ce19d9d Add recyclerview to support libs docs 
Change-Id: Ibe863e4b1930670353e6e0658fbc83e694dec3a4
 2014-01-16 15:55:56 +00:00
Ying Wang
da9ef76b5d am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit 'a296a71e0c344e95f2d4dfe59d850a55130fe58a':
  [MIPS] Reenable linker fatal-warnings
 2014-01-16 01:11:15 +00:00
Ying Wang
a296a71e0c am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings" 
* commit '166bc090ab0ac7ac7a620889fd96656be4ca69c1':
  [MIPS] Reenable linker fatal-warnings
 2014-01-15 17:08:22 -08:00
Chris Dearman
13eb1eb53d [MIPS] Reenable linker fatal-warnings 
Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
 2014-01-15 19:00:37 +00:00
Ying Wang
c4f4a5325f am 14af5526: am c4c71f06: Merge "Remove aprof support from the build system." 
* commit '14af5526b5001431af49e40be049b5475de64f15':
  Remove aprof support from the build system.
 2014-01-14 23:42:33 +00:00
Ying Wang
14af5526b5 am c4c71f06: Merge "Remove aprof support from the build system." 
* commit 'c4c71f06ab002c4b12042ba7752272311b62b0f9':
  Remove aprof support from the build system.
 2014-01-14 15:36:57 -08:00
Ying Wang
4587455075 Remove aprof support from the build system. 
This reverts the commit 70dc3e1d.

Change-Id: I480b005579805d2608d05dac41e32bb44642e813
 2014-01-14 14:26:05 -08:00
Ying Wang
adc66128dc am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64." 
* commit 'b6c570510aa1d2747538fe734292873ed13f5b67':
  Install 64-bit libraries to /system/lib64.
 2014-01-14 20:10:16 +00:00
Ying Wang
b6c570510a am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64." 
* commit 'f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c':
  Install 64-bit libraries to /system/lib64.
 2014-01-14 12:08:32 -08:00
Ying Wang
c634974d37 Install 64-bit libraries to /system/lib64. 
/system/lib always contains 32-bit libraries, and /system/lib64 (if
present) always contains 64-bit libraries.
Move things around a little bit, so TARGET_ARCH can be used to define
the build paths.

Bug: 11654773
Change-Id: I2edd91e162c7a20d7719d7bae15e5fa6c2a5b498
 2014-01-13 16:20:31 -08:00
Elliott Hughes
538009b26c am dda9d8ee: am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 
* commit 'dda9d8ee0fe580d663a4eaed49be5d39c3de2882':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
 2014-01-11 00:50:44 +00:00
Elliott Hughes
dda9d8ee0f am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 
* commit '37c699c28a464561b186ab11a5af60214ae25d9a':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
 2014-01-10 16:47:30 -08:00
Elliott Hughes
37c699c28a Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 2014-01-11 00:41:25 +00:00
Elliott Hughes
dddb566eba Remove obsolete CUSTOM_KERNEL_HEADERS. 
Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
 2014-01-10 16:35:08 -08:00
Ying Wang
ee2a10eb18 am 0650d4a2: am 987616ed: Merge "Fix x86_64 build" 
* commit '0650d4a2eadc96577b2e03fbda000ed5a340d8ac':
  Fix x86_64 build
 2014-01-10 17:40:26 +00:00
Ying Wang
0650d4a2ea am 987616ed: Merge "Fix x86_64 build" 
* commit '987616ed09adc65e6636f7a3a82fa7b38021b6e2':
  Fix x86_64 build
 2014-01-10 09:38:13 -08:00
Pavel Chupin
522b0a633c Fix x86_64 build 
Issue introduced here:
https://android-review.googlesource.com/#/c/71842/

Change-Id: I8a60641ff07173fcedf259df89aaaa4bc6d6ea3e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2014-01-10 19:23:08 +04:00
Brian Carlstrom
1df8d17911 am 98c72521: am ad8271a8: Merge "Add support for ALTERNATE_JAVAC" 
* commit '98c7252113ad4adfc11bb500d737b96c0544106f':
  Add support for ALTERNATE_JAVAC
 2014-01-10 02:39:02 +00:00
Brian Carlstrom
98c7252113 am ad8271a8: Merge "Add support for ALTERNATE_JAVAC" 
* commit 'ad8271a8e6a1f050c1852d6dc3df0eb6777e5606':
  Add support for ALTERNATE_JAVAC
 2014-01-09 18:36:22 -08:00
Brian Carlstrom
ad8271a8e6 Merge "Add support for ALTERNATE_JAVAC" 2014-01-10 02:31:26 +00:00
Ying Wang
02e4bb6b10 am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules." 
* commit 'cb5f9a282e713096104e9d7b18bb028f926dbd2a':
  Define PRIVATE_TARGET_ variables for only target modules.
 2014-01-10 00:34:56 +00:00
Ying Wang
cb5f9a282e am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules." 
* commit 'a26ea82e6a226575f19fec6b5bea111cbe20c233':
  Define PRIVATE_TARGET_ variables for only target modules.
 2014-01-09 16:32:07 -08:00
Brian Carlstrom
b6dcef8777 Add support for ALTERNATE_JAVAC 
Bug: 12476356
Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4
 2014-01-09 15:33:23 -08:00
Ying Wang
7fff9a1a56 Define PRIVATE_TARGET_ variables for only target modules. 
Change-Id: I12c54bfffd9acb78a61d1032a087a0edaf3bf12c
 2014-01-09 14:39:41 -08:00
Ying Wang
fb5ae89fea am b5fb7f24: am aed49987: Merge "Allow clang to build host binaries." 
* commit 'b5fb7f242e925f482557227623120f1e4480beba':
  Allow clang to build host binaries.
 2014-01-09 19:00:15 +00:00
Ying Wang
b5fb7f242e am aed49987: Merge "Allow clang to build host binaries." 
* commit 'aed499879210c7432c1c5b3869f383b27b17dafc':
  Allow clang to build host binaries.
 2014-01-09 10:57:03 -08:00
Ying Wang
aed4998792 Merge "Allow clang to build host binaries." 2014-01-09 18:52:06 +00:00
Ying Wang
83709a21c1 am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space" 
* commit '95fc1a50750f8d0341e10f7ea39d37e3af5b21f3':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
 2014-01-08 00:53:31 +00:00
Ying Wang
95fc1a5075 am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space" 
* commit 'f12d48104ba782d877afc31a081748fdc881f2b6':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
 2014-01-07 16:50:49 -08:00
Ying Wang
ad6674cd60 PRODUCT_BOOT_JARS as a list of jar names separated by space 
This makes it easier for OEMs to extend the PRODUCT_BOOT_JARS in their
product configuration files.

Change-Id: I5feca2f808b1914c275f28c7a4c38cca2ba6851f
 2014-01-07 14:31:49 -08:00
Logan Chien
e6f65438a4 Allow clang to build host binaries. 
Change-Id: I7e4f9dc6f69a97cfefdfa2ed55c5d7b8ad496da7
 2014-01-07 14:49:20 +08:00
Ying Wang
b86c34ae64 am f05eecc3: am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt" 
* commit 'f05eecc3682d3599906e2ff61209e5c191cbf29b':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
 2014-01-04 02:02:39 +00:00
Ying Wang
f05eecc368 am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt" 
* commit 'a47d12e38ae38a6fdceb54172490c94408efa0de':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
 2014-01-03 17:59:59 -08:00
Ying Wang
9db168ca5c Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt 
Because a library or app can be built from mere static libraries,
or generated java files. For example, framework is built from only
static library framework-base but without LOCAL_SRC_FILES.
Also added framework2 to PRODUCT_PACKAGES.
Previously framework2.jar was installed by dependency explicitly
established in frameworks/base/Android.mk. That's not enough for the
.odex file.
This fixed the boot failure reported in bug 12382916.

Bug: 12382916
Change-Id: If1a70261ab2bb7fef77cf7b7b995bdc029be0fc3
 2014-01-03 17:53:00 -08:00
Michael Runge
a8e325788c am 41e19a4c: am 6b55f007: am facd992e: Makefile used spaces instead of a tab 
* commit '41e19a4cf0f10740aa3437b1c2365e49d4f15181':
  Makefile used spaces instead of a tab
 2013-12-26 23:37:45 +00:00
Michael Runge
d961b7d083 am 5636d07a: am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files 
* commit '5636d07a29108c77e6b8d38d96b0a1af3bae53ec':
  Enabled incrementals to patch + rename moved files
 2013-12-26 23:37:44 +00:00
Michael Runge
41e19a4cf0 am 6b55f007: am facd992e: Makefile used spaces instead of a tab 
* commit '6b55f00762c03b3625862b89f704090f58f970e7':
  Makefile used spaces instead of a tab
 2013-12-26 15:33:32 -08:00
Michael Runge
5636d07a29 am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files 
* commit 'a80542dbf4f193c59525b8749871bcdf4ae4283a':
  Enabled incrementals to patch + rename moved files
 2013-12-26 15:33:27 -08:00
Elliott Hughes
b986ad2a1c am 9464ca1b: am b8559790: Merge "Remove a non-existent directory from the include path." 
* commit '9464ca1b97ace55f97c44e3362033fd31de33495':
  Remove a non-existent directory from the include path.
 2013-12-21 00:00:51 +00:00
Elliott Hughes
9464ca1b97 am b8559790: Merge "Remove a non-existent directory from the include path." 
* commit 'b8559790d43f2483c7910e87e33ceebeb40e9bec':
  Remove a non-existent directory from the include path.
 2013-12-20 15:57:57 -08:00
Elliott Hughes
26990f5573 Remove a non-existent directory from the include path. 
Brings aarch64 in line with the other architectures.

Change-Id: Iba3fd33e34e3b5bc071f55cfe09de9e55a023cf7
 2013-12-20 15:37:55 -08:00
Michael Runge
6b55f00762 am facd992e: Makefile used spaces instead of a tab 
* commit 'facd992ec73de763cfbca32dd6aa38ff76a07613':
  Makefile used spaces instead of a tab
 2013-12-20 12:36:49 -08:00
Michael Runge
facd992ec7 Makefile used spaces instead of a tab 
Change-Id: Ia34f80d99062ef2899527f11d7bf72e78c63e31c
 2013-12-20 11:50:16 -08:00
Michael Runge
a80542dbf4 am 4038aa8f: Enabled incrementals to patch + rename moved files 
* commit '4038aa8fff8c68733bff8b55d8c8d1b59713ca37':
  Enabled incrementals to patch + rename moved files
 2013-12-20 11:35:07 -08:00
Woody Lin
dcefbfde3f Add htc' to _vendor_owner_whitelist' 
Change-Id: I92bfc8d41d102f687fd8a5b632be3c01c2d005fd
Signed-off-by: Woody Lin <woody_lin@htc.com>
 2013-12-19 15:08:35 -08:00
Colin Cross
20f04df825 Merge "build: always include host java files in platform.zip" into klp-volantis-dev 2013-12-19 06:34:00 +00:00
Colin Cross
c451a373a4 build: always include host java files in platform.zip 
Building recovery requires building a host .jar file.  Change
platform.zip to always include the necessary host java prebuilts,
instead of only when building the 'platform-java' target.

Bug: 12186985
Change-Id: Ic823d764cb6b39bbf8c5d90c94b5dc99b55d34dc
 2013-12-18 20:01:38 -08:00
Elliott Hughes
85967c7ef0 am d46e3f1f: am 3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h." 
* commit 'd46e3f1fdfbd5511fc99fb44fbf272e28a823f8b':
  Fix aarch64 and x86-64 AndroidConfig.h.
 2013-12-18 23:38:27 +00:00
Elliott Hughes
d46e3f1fdf am 3d3dd4a1: Merge "Fix aarch64 and x86-64 AndroidConfig.h." 
* commit '3d3dd4a186309a62a744d7fea1157158e05bcf6e':
  Fix aarch64 and x86-64 AndroidConfig.h.
 2013-12-18 15:35:58 -08:00
Elliott Hughes
3d3dd4a186 Merge "Fix aarch64 and x86-64 AndroidConfig.h." 2013-12-18 23:31:47 +00:00
Elliott Hughes
98593a66af Fix aarch64 and x86-64 AndroidConfig.h. 
_LARGEFILE_SOURCE should never be defined with bionic.
_FILE_OFFSET_BITS should be 64 on 64-bit architectures.

Change-Id: I7acf6b39a3af7782d5d7ad00f709593d96fa8522
 2013-12-18 15:17:42 -08:00
Ying Wang
0d16928e60 am 6cc89747: am 8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH" 
* commit '6cc89747ec0c5a553a99acd9be14eb9eaac1c89f':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH
 2013-12-18 18:59:38 +00:00
Ying Wang
6cc89747ec am 8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH" 
* commit '8e3a71f75e08b4ad580903f2edc7edea5dc07806':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH
 2013-12-18 10:55:54 -08:00
Ying Wang
f3584968ff Simplify the calculation of LOCAL_UNSTRIPPED_PATH 
Also this fixes the LOCAL_UNSTRIPPED_PATH if the module is installed to
the vendor dir via LOCAL_PROPRIETARY_MODULE.

Bug: 11289169
Change-Id: Ib07e5761411210963076487fe0e148c259e1e082
 2013-12-18 10:41:01 -08:00
Ying Wang
472d0595e9 am d32aaf93: am 3fc636c2: Merge "Create the dest dir before copying over files." 
* commit 'd32aaf9374e6e97fdabd80ac1c2948c262e03af4':
  Create the dest dir before copying over files.
 2013-12-18 01:48:18 +00:00
Ying Wang
d32aaf9374 am 3fc636c2: Merge "Create the dest dir before copying over files." 
* commit '3fc636c25af0ddcce6ebe6f99a1d7ca83b84f69a':
  Create the dest dir before copying over files.
 2013-12-17 17:45:32 -08:00
Ying Wang
17a7e2bee3 Create the dest dir before copying over files. 
Change-Id: I8ad79704558d7a10099e64fc1d032c8ddd3330b9
 2013-12-17 17:37:16 -08:00
Ying Wang
9507a0fd36 am 82c59aef: am 71e8a22e: Merge "Add DEXPREOPT support for ART" 
* commit '82c59aefcd8ad4790ceb957e2840714da937534b':
  Add DEXPREOPT support for ART
 2013-12-18 01:01:28 +00:00
Ying Wang
82c59aefcd am 71e8a22e: Merge "Add DEXPREOPT support for ART" 
* commit '71e8a22e3478b6b4277957ef47486058a5306286':
  Add DEXPREOPT support for ART
 2013-12-17 16:58:43 -08:00
Ying Wang
71e8a22e34 Merge "Add DEXPREOPT support for ART" 2013-12-18 00:55:28 +00:00
Christopher Ferris
5fb7c74aeb am 7bda5aac: am d12ee620: Merge "Re-enable uapi kernel headers for arm." 
* commit '7bda5aacb1fdb765e2073c00da396bd93db531e5':
  Re-enable uapi kernel headers for arm.
 2013-12-17 23:15:55 +00:00
Christopher Ferris
7bda5aacb1 am d12ee620: Merge "Re-enable uapi kernel headers for arm." 
* commit 'd12ee620b064d262abce691771fe53ba8987d06f':
  Re-enable uapi kernel headers for arm.
 2013-12-17 15:11:58 -08:00
Christopher Ferris
d12ee620b0 Merge "Re-enable uapi kernel headers for arm." 2013-12-17 23:06:38 +00:00
Brian Carlstrom
ced4bff58e Add DEXPREOPT support for ART 
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
 2013-12-17 14:44:00 -08:00
Colin Cross
59d411c895 Merge changes I57b49033,I03ddf981 into klp-volantis-dev 
* changes:
  Revert "Disable recovery in PDK builds"
  pdk: add bouncycastle-host javalib.jar to platform.zip
 2013-12-17 21:43:10 +00:00
Colin Cross
57b490334a Revert "Disable recovery in PDK builds" 
This reverts commit 2e9d15d0b6.

Bug: 12186985
 2013-12-17 12:09:02 -08:00
Colin Cross
074d838590 pdk: add bouncycastle-host javalib.jar to platform.zip 
Add javalib.jar from bouncycastle-host to the platform.zip to allow
building dumpkey.jar, which is necessary to build recovery.
Host java libraries have no classes.jar, so they have to be kept
in a separate list fromt target java libraries.  Also add an implicit
rule to copy the host files out of the pdk fusion intermediates.

Bug: 12186985
Change-Id: I03ddf9810bc7a4ef7aac8427c4607d9eea27cc6b
 2013-12-17 12:06:59 -08:00
Elliott Hughes
07d4b794b8 am 861fea29: am 3fd89533: Merge "Make aarch64 more like arm wrt strict-aliasing." 
* commit '861fea291dfcb9c536df9849e39f7ba3eca1cd52':
  Make aarch64 more like arm wrt strict-aliasing.
 2013-12-17 15:44:16 +00:00
Elliott Hughes
861fea291d am 3fd89533: Merge "Make aarch64 more like arm wrt strict-aliasing." 
* commit '3fd895336dc7cfe219be4e1d49096bf53e661503':
  Make aarch64 more like arm wrt strict-aliasing.
 2013-12-17 07:42:33 -08:00
Elliott Hughes
c294779d7f Make aarch64 more like arm wrt strict-aliasing. 
All thumb code compiles with -fno-strict-aliasing. Let's not make aarch64
porting any more difficult than it needs to be.

Change-Id: I94874df1217b69532c328d7c86c9961631ebde8a
 2013-12-16 18:01:19 -08:00
Christopher Ferris
9824ce4e1d Re-enable uapi kernel headers for arm. 
Bug: 11559337
Change-Id: Ib914e5f22b10d5a74edc357d42b0dcb223185ab4
 2013-12-16 13:58:39 -08:00
Michael Runge
4038aa8fff Enabled incrementals to patch + rename moved files 
Change-Id: I551fc5291847e3ace15361c203d86f566c26da97
 2013-12-16 11:29:51 -08:00
Christopher Ferris
bc7064b506 am 7f36451b: am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm."" 
* commit '7f36451b83860f3f5b21edc467605066035354d6':
  Revert "Enable uapi kernel headers for arm."
 2013-12-16 18:37:31 +00:00
Christopher Ferris
7f36451b83 am 657eadd4: Merge "Revert "Enable uapi kernel headers for arm."" 
* commit '657eadd4b78b91185ca2042ffb7f92be84e6c1c4':
  Revert "Enable uapi kernel headers for arm."
 2013-12-16 10:33:03 -08:00
Christopher Ferris
e2c73b3194 Revert "Enable uapi kernel headers for arm." 
This reverts commit 88c6c533e1.

Change-Id: I3cd84383c6f217bc6e627e16b2d0c7d948f8131d
 2013-12-16 18:21:27 +00:00
Christopher Ferris
5e55aabcb3 am 9c15d111: am 84b99aad: Merge "Enable uapi kernel headers for arm." 
* commit '9c15d11156d60e1721dd8e1b3c018b4f0d9a00b0':
  Enable uapi kernel headers for arm.
 2013-12-16 18:02:28 +00:00
Christopher Ferris
9c15d11156 am 84b99aad: Merge "Enable uapi kernel headers for arm." 
* commit '84b99aadddf3cd9d02a60b43923ed11fc7341c9f':
  Enable uapi kernel headers for arm.
 2013-12-16 09:57:57 -08:00
Christopher Ferris
88c6c533e1 Enable uapi kernel headers for arm. 
Bug: 11559337
Change-Id: Idd251338f707b7c6a08f43a79f9784c57142f43c
 2013-12-16 09:12:19 -08:00
Ying Wang
3d10656e99 am d93df332: am 10b1ffae: Merge "enable PIE for dynamically linked Linux host executables" 
* commit 'd93df3321227b167bf68ead55adf76fc12ef8c60':
  enable PIE for dynamically linked Linux host executables
 2013-12-13 18:27:08 +00:00
Ying Wang
d93df33212 am 10b1ffae: Merge "enable PIE for dynamically linked Linux host executables" 
* commit '10b1ffaed921bce3014d39ca9dcb705550aa03f0':
  enable PIE for dynamically linked Linux host executables
 2013-12-13 10:24:12 -08:00
Joshua J. Drake
b0eafa21b9 enable PIE for dynamically linked Linux host executables 
Compile all host programs for Android with -fPIE and -pie. This
enables PIE (Position Independent Executables), which helps
protect these applications from exploitation due to memory
management bugs.

Note: PIE *static* executables are not supported at this time. darwin
and windows are also not supported.

Change-Id: I67c1be297711ea23064c349f97ebd02eef3eff09
 2013-12-12 17:36:53 -08:00
Ying Wang
3157096157 am c5e3539b: am 5859f105: Merge "Enable NX protections" 
* commit 'c5e3539b6fe67288d097d29b68d5f669b97a71ad':
  Enable NX protections
 2013-12-13 00:12:47 +00:00
Ying Wang
c5e3539b6f am 5859f105: Merge "Enable NX protections" 
* commit '5859f105fad3ce1ba76fb252c4c5b8fe357a3ce4':
  Enable NX protections
 2013-12-12 16:09:43 -08:00
Ying Wang
5859f105fa Merge "Enable NX protections" 2013-12-13 00:04:42 +00:00
Ben Cheng
74f27cffd9 am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID__=1" 
* commit 'af3d1408be4acc8dd6ab0a34d5413c8996f7fa5f':
  Add an explicit definition of __ANDROID__=1
 2013-12-12 22:01:29 +00:00
Ben Cheng
af3d1408be am 2609640e: Merge "Add an explicit definition of __ANDROID__=1" 
* commit '2609640eaea1ba89a493cff2847cb9ec993dc9fc':
  Add an explicit definition of __ANDROID__=1
 2013-12-12 13:57:55 -08:00
Ben Cheng
cd7b02d911 Add an explicit definition of __ANDROID__=1 
Once the aarch64 toolchain is refreshed this will be removed.
Also removed some CFLAG duplications.

Change-Id: I42fd86931263af82042ea696196fb25e948fe9cb
 2013-12-12 13:08:55 -08:00
Joshua J. Drake
afb45637b2 Enable NX protections 
Add -Wa,--noexecstack and -Wl,-z,noexecstack as default
flags when compiling host-side applications.  This enables
NX protections, which prevent code from executing on the
stack or heap.  NX protections make exploiting memory
corruption issues more challenging and is an important
security feature.

Change-Id: Iae580abe887e01f9029ec2a4e0fc0aae496724a4
 2013-12-12 10:47:08 -08:00
Ying Wang
580b396331 am 0e2779bd: am 8a373fd5: Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64" 
* commit '0e2779bdbb80b6f94534af0b9128ced4b6caa418':
  Added TARGET_IS_64_BIT flag for x86_64 and aarch64
 2013-12-11 21:02:29 +00:00
Ying Wang
0e2779bdbb am 8a373fd5: Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64" 
* commit '8a373fd5aef4eafbd716abe517a99ef0b3d69094':
  Added TARGET_IS_64_BIT flag for x86_64 and aarch64
 2013-12-11 10:11:21 -08:00
Ying Wang
8a373fd5ae Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64" 2013-12-11 17:52:26 +00:00
Alexey Volkov
a1779eb11b Added TARGET_IS_64_BIT flag for x86_64 and aarch64 
Change-Id: Ibdf9dafa3aeaf4b58b4a559ed05e36e2793bf6ed
Signed-off-by: Alexey Volkov <alexey.v.volkov@intel.com>
 2013-12-11 17:18:56 +04:00
Ying Wang
65ad13ae66 am 68abe34c: am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc." 
* commit '68abe34c9838993af5c0c6dbc4017c3cd8d7e86c':
  Add "-encoding UTF-8" option to javadoc.
 2013-12-10 19:38:13 +00:00
Ying Wang
68abe34c98 am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc." 
* commit 'c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266':
  Add "-encoding UTF-8" option to javadoc.
 2013-12-10 11:36:18 -08:00
Ying Wang
34e3e170e4 Add "-encoding UTF-8" option to javadoc. 
This fixed docs build on Mac OS X 10.9 with Java 7.
Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3
 2013-12-10 11:30:01 -08:00
Daniel Tsai
d54129e3db build: Fix failed to assign a module name different with it's file name to a prebuilt module 
Build system can not find the dependent library if assigning a
multi-prebuilt which module name is different with it's library
file name as following:
    PREBUILT_LIBS := libabc_debug:libabc.a

Change-Id: I05bdc8cebcabf74195198e3cefa1b8923f87d406
 2013-12-06 10:01:05 -08:00
Narayan Kamath
8728619848 am b8d3879e: am 99bb0365: am 948206c0: Merge "Fix tools path on Mac OS for java 7." 
* commit 'b8d3879e6298b3800d959aaf7fe9ed1a2a163ff7':
  Fix tools path on Mac OS for java 7.
 2013-12-06 17:20:21 +00:00
Narayan Kamath
6835cbf932 am 0e4cccbf: am a8dcc8c8: am fe57f665: Merge "A few more Java7 related clean ups." 
* commit '0e4cccbff61dc77e68f0dd13e5c96432febe82bb':
  A few more Java7 related clean ups.
 2013-12-06 17:20:20 +00:00
Narayan Kamath
b8d3879e62 am 99bb0365: am 948206c0: Merge "Fix tools path on Mac OS for java 7." 
* commit '99bb0365d53186c8ece6ac4e61ca2d303d0e0f0a':
  Fix tools path on Mac OS for java 7.
 2013-12-06 09:16:18 -08:00
Narayan Kamath
0e4cccbff6 am a8dcc8c8: am fe57f665: Merge "A few more Java7 related clean ups." 
* commit 'a8dcc8c81a567902bee69a8dcd7357d391ef39b9':
  A few more Java7 related clean ups.
 2013-12-06 09:16:18 -08:00
Narayan Kamath
99bb0365d5 am 948206c0: Merge "Fix tools path on Mac OS for java 7." 
* commit '948206c026c8751b9d53341dfe9c2c2905ebb002':
  Fix tools path on Mac OS for java 7.
 2013-12-06 09:13:58 -08:00
Narayan Kamath
a8dcc8c81a am fe57f665: Merge "A few more Java7 related clean ups." 
* commit 'fe57f665074665edf469ad1e1d0fcef749f9a5bb':
  A few more Java7 related clean ups.
 2013-12-06 09:13:58 -08:00
The Android Open Source Project
722581a598 Merge commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD 
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
 2013-12-05 12:59:39 -08:00
Ying Wang
c404d34282 am 7493c39e: Add utility function find-files-in-subdirs 
* commit '7493c39eff203ed027b0f0ea320c26dd7d895b22':
  Add utility function find-files-in-subdirs
 2013-12-05 10:39:42 -08:00
Ying Wang
7493c39eff Add utility function find-files-in-subdirs 
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.

Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
(cherry picked from commit 85898bca99)
 2013-12-05 18:37:20 +00:00
Narayan Kamath
ab2e2e792e Fix tools path on Mac OS for java 7. 
Change-Id: Ieb72b9e10771ee372bacf20258242cb006c29fef
 2013-12-05 17:56:23 +00:00
Ying Wang
8df06ce0fa am e2d5b777: am e65c2969: Merge "Add utility function find-files-in-subdirs" 
* commit 'e2d5b7772b0d4de8220f08e35430ea1bba3a9fcc':
  Add utility function find-files-in-subdirs
 2013-12-05 14:24:43 +00:00
Ying Wang
e2d5b7772b am e65c2969: Merge "Add utility function find-files-in-subdirs" 
* commit 'e65c29697ac2cad422a094720944d326128f17c3':
  Add utility function find-files-in-subdirs
 2013-12-05 06:22:37 -08:00
Narayan Kamath
e2d27887be A few more Java7 related clean ups. 
- Separate SDK checking from version checking and
  make messages clearer.
- Add explicit source & target versions for javac to
  make things clearer.
- Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to
  EXPERIMENTAL_USE_JAVA7.
- Allow Oracle JDK 1.7 to be used on Mac OS, since there's
  no official OpenJDK support for that platform.

Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
 2013-12-05 13:23:06 +00:00
Ying Wang
7c8c7bd4b6 Add utility function find-files-in-subdirs 
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.

Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
 2013-12-04 16:56:38 -08:00
Joe Onorato
e939cb5cfe am 0df5e7b3: am 36b89ff9: Add a convenient target for building a zip file of javadocs: -docs.zip 
* commit '0df5e7b365d8baa6f5a2f5a1113e1a20cdd0fe58':
  Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
 2013-12-04 17:47:10 +00:00
Joe Onorato
0df5e7b365 am 36b89ff9: Add a convenient target for building a zip file of javadocs: -docs.zip 
* commit '36b89ff93fe1fe55351564c258023255d70b6378':
  Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
 2013-12-04 09:43:06 -08:00
Joe Onorato
36b89ff93f Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip 
Change-Id: I97fcc0d467f3b7582570b9be7e15acc0a5b550a5
 2013-12-04 02:32:06 -08:00
Dave Langemak
b738b392f4 am c58cdd36: am 48130ea9: am 63ac2753: .1 becomes .2 
* commit 'c58cdd36af224ac00c105255614e9e58bc8c02b6':
  .1 becomes .2
 2013-12-03 23:30:42 +00:00
Dave Langemak
c58cdd36af am 48130ea9: am 63ac2753: .1 becomes .2 
* commit '48130ea9dead7ab64a389b84aaf9d8a8597e3079':
  .1 becomes .2
 2013-12-03 15:27:52 -08:00
Dave Langemak
63ac275378 .1 becomes .2 
Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
 2013-12-03 15:06:56 -08:00
Colin Cross
9781049c41 Merge "Disable recovery in PDK builds" into klp-volantis-dev 2013-12-03 17:44:08 +00:00
Doug Zongker
a6fadb61ca am 57c9ffef: am 9b23f2cd: add option to generate two-step recovery files 
* commit '57c9ffef30a6f34e126d8e89a08d208b05cc4901':
  add option to generate two-step recovery files
 2013-12-03 08:58:11 -08:00
Mike Lockwood
2e9d15d0b6 Disable recovery in PDK builds 
Change-Id: Ic6ee44cef37104c8d7facc28dfe45d0ef832ebd0
 2013-12-02 23:20:53 -08:00
Ying Wang
04324c2780 am 6178f6f0: Merge "Run ar in Deterministic mode." 
* commit '6178f6f0182b0b9c8063123dd62e86108eb7a212':
  Run ar in Deterministic mode.
 2013-12-02 14:26:45 -08:00
Ying Wang
b2f39181c6 Run ar in Deterministic mode. 
Unfortunately no such flag was found for the host ar on Mac OS X.
https://code.google.com/p/android/issues/detail?id=60705

Change-Id: Ic2f75c871f0b5ae3cf20c1255458f7b921054d67
 2013-12-02 14:15:23 -08:00
Ying Wang
71e5dd3055 am 7a772619: Merge "core: support make 4.00" 
* commit '7a77261988354b13996e5ba84b87351b571a5a52':
  core: support make 4.00
 2013-12-02 11:22:26 -08:00