OSDN Git Service
Colin Cross [Thu, 23 Jan 2014 02:04:38 +0000 (02:04 +0000)]
Merge changes I5f7df519,I0e8b02f0
* changes:
build: use correct arm vs thumb arguments for 2nd arch builds
build: print module that has unhandled install path
Colin Cross [Thu, 23 Jan 2014 01:36:05 +0000 (17:36 -0800)]
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
Ying Wang [Thu, 23 Jan 2014 01:44:07 +0000 (01:44 +0000)]
Merge "Make sure to install the .odex when running "make <module_name>""
Colin Cross [Thu, 23 Jan 2014 01:34:28 +0000 (17:34 -0800)]
build: print module that has unhandled install path
Print the name of the module that is providing an unhandled install
path.
Change-Id: I0e8b02f01de1dde715f0985034ad943f793218ba
Dirk Dougherty [Thu, 23 Jan 2014 01:09:38 +0000 (01:09 +0000)]
am
c3fb41d0: am
2171a443: am
829e4db4: am
0bb2c170: Merge commit \'
bb94d790\' into manualmerge
* commit '
c3fb41d0cd7c172934054794368587d6f62b686b':
Support generated samples_toc.cs file.
Dirk Dougherty [Thu, 23 Jan 2014 01:07:34 +0000 (01:07 +0000)]
am
2171a443: am
829e4db4: am
0bb2c170: Merge commit \'
bb94d790\' into manualmerge
* commit '
2171a443a6a6a8e6e8676bcd8a700d3ed7c09937':
Support generated samples_toc.cs file.
Dirk Dougherty [Thu, 23 Jan 2014 01:06:14 +0000 (01:06 +0000)]
am
829e4db4: am
0bb2c170: Merge commit \'
bb94d790\' into manualmerge
* commit '
829e4db46fc5ea3816b7d6432b9bacb96cb68294':
Support generated samples_toc.cs file.
Dirk Dougherty [Thu, 23 Jan 2014 01:03:21 +0000 (17:03 -0800)]
am
0bb2c170: Merge commit \'
bb94d790\' into manualmerge
* commit '
0bb2c1702a0ca2b174b70ac2d5364548453ba524':
Support generated samples_toc.cs file.
Dirk Dougherty [Thu, 23 Jan 2014 01:00:19 +0000 (17:00 -0800)]
Merge commit '
bb94d790' into manualmerge
Conflicts:
tools/droiddoc/templates-sdk/sample.cs
Change-Id: Ic1640c3620eb6b770bae7766af9ea5c64d74afe0
Ying Wang [Thu, 23 Jan 2014 00:50:21 +0000 (16:50 -0800)]
Make sure to install the .odex when running "make <module_name>"
Change-Id: I64195294dad15b7d379d667f4c4738c2808fd384
Dirk Dougherty [Mon, 25 Nov 2013 19:35:03 +0000 (11:35 -0800)]
Support generated samples_toc.cs file.
(cherry picked from commit
d239e4c9b5c154129d67bec9cd7b37b2720bf2b6)
Change-Id: I3409d7d3beefaacb7d56e15a47597241d257c213
Ying Wang [Wed, 22 Jan 2014 20:42:56 +0000 (20:42 +0000)]
am
d879a53c: am
b361a17f: am
3dd8a300: am
dbc9eacb: Merge "Make jgrep, cgrep, resgrep not recurse into \'out\' directory."
* commit '
d879a53c9d5078be9ddaa474d1778da420d249c0':
Make jgrep, cgrep, resgrep not recurse into 'out' directory.
Ying Wang [Wed, 22 Jan 2014 20:40:01 +0000 (20:40 +0000)]
am
b361a17f: am
3dd8a300: am
dbc9eacb: Merge "Make jgrep, cgrep, resgrep not recurse into \'out\' directory."
* commit '
b361a17f26f677ff7d73992982d58b6a2eaaa38d':
Make jgrep, cgrep, resgrep not recurse into 'out' directory.
Ying Wang [Wed, 22 Jan 2014 20:36:39 +0000 (20:36 +0000)]
am
3dd8a300: am
dbc9eacb: Merge "Make jgrep, cgrep, resgrep not recurse into \'out\' directory."
* commit '
3dd8a3004a3da8a6fe91628478540567cd15039d':
Make jgrep, cgrep, resgrep not recurse into 'out' directory.
Ying Wang [Wed, 22 Jan 2014 20:34:25 +0000 (12:34 -0800)]
am
dbc9eacb: Merge "Make jgrep, cgrep, resgrep not recurse into \'out\' directory."
* commit '
dbc9eacb272634b5974a80457da2f3a60487882b':
Make jgrep, cgrep, resgrep not recurse into 'out' directory.
Ying Wang [Wed, 22 Jan 2014 20:30:06 +0000 (20:30 +0000)]
Merge "Make jgrep, cgrep, resgrep not recurse into 'out' directory."
Narayan Kamath [Wed, 22 Jan 2014 10:59:59 +0000 (10:59 +0000)]
am
5d7745dc: am
6d5b83d8: am
b533bfd6: am
f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7."
* commit '
5d7745dcb868ff56a7487ca55a904783dcc62936':
Make envsetup.sh set JAVA_HOME correctly for java7.
Narayan Kamath [Wed, 22 Jan 2014 10:56:55 +0000 (10:56 +0000)]
am
6d5b83d8: am
b533bfd6: am
f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7."
* commit '
6d5b83d82739ccedf50f778a06d965a61107980a':
Make envsetup.sh set JAVA_HOME correctly for java7.
Narayan Kamath [Wed, 22 Jan 2014 10:53:43 +0000 (10:53 +0000)]
am
b533bfd6: am
f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7."
* commit '
b533bfd6075de5b6ae8a26b1f4b34d12c213c4cb':
Make envsetup.sh set JAVA_HOME correctly for java7.
Narayan Kamath [Wed, 22 Jan 2014 10:50:11 +0000 (02:50 -0800)]
am
f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7."
* commit '
f99a23b10f1d6d9cf12c6dd78700ab2186a1fdb4':
Make envsetup.sh set JAVA_HOME correctly for java7.
Narayan Kamath [Wed, 22 Jan 2014 10:44:48 +0000 (10:44 +0000)]
Merge "Make envsetup.sh set JAVA_HOME correctly for java7."
Narayan Kamath [Fri, 17 Jan 2014 10:05:25 +0000 (10:05 +0000)]
Make envsetup.sh set JAVA_HOME correctly for java7.
Note that despite the location of this change, this function
is run only during "lunch" and not during ". build/envsetup.sh"
Also, make it easier to switch back and forth between java6 and 7
on the same session.
bug:
8992787
Change-Id: I56ec0ba8552b46c04204a8b96b9abc0180f7605f
Ying Wang [Wed, 22 Jan 2014 04:25:46 +0000 (20:25 -0800)]
Revert "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
This reverts commit
06b3255118ed4b92361c195dc77e6b600fe24c21.
Ying Wang [Wed, 22 Jan 2014 04:06:56 +0000 (04:06 +0000)]
am
4a814d0a: am
a0d68280: am
f5db4548: am
62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
* commit '
4a814d0a69470c96414a5e49b1ff90eb8935e2f9':
Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
Ying Wang [Wed, 22 Jan 2014 04:03:13 +0000 (04:03 +0000)]
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."
Ying Wang [Wed, 22 Jan 2014 04:00:19 +0000 (04:00 +0000)]
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."
Ying Wang [Wed, 22 Jan 2014 03:57:41 +0000 (19:57 -0800)]
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."
Ying Wang [Wed, 22 Jan 2014 03:48:59 +0000 (03:48 +0000)]
Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
Ying Wang [Wed, 22 Jan 2014 03:48:27 +0000 (03:48 +0000)]
Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
This reverts commit
ca37190711ca48a6bfd6b5700a54cd580abd1e5b.
Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
Colin Cross [Wed, 22 Jan 2014 00:54:00 +0000 (16:54 -0800)]
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
Ying Wang [Tue, 21 Jan 2014 21:24:01 +0000 (21:24 +0000)]
Merge "Support to build executables for TARGET_2ND_ARCH"
Ying Wang [Tue, 21 Jan 2014 20:44:23 +0000 (20:44 +0000)]
am
6e8e82ea: am
10515519: am
70cc8553: am
8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
* commit '
6e8e82ea585f964981896cc510f007574ce6da2c':
Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
Ying Wang [Tue, 21 Jan 2014 20:41:21 +0000 (20:41 +0000)]
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.
Ying Wang [Tue, 21 Jan 2014 20:37:50 +0000 (20:37 +0000)]
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.
Ying Wang [Tue, 21 Jan 2014 20:36:33 +0000 (12:36 -0800)]
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.
Ying Wang [Tue, 21 Jan 2014 20:31:31 +0000 (20:31 +0000)]
Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
Ying Wang [Tue, 21 Jan 2014 20:17:11 +0000 (12:17 -0800)]
resolved conflicts for merge of
5f95f442 to master
Change-Id: I498e37f711084a0f86f6dcb6dcd2d94ab8e1896d
Ying Wang [Tue, 21 Jan 2014 20:01:29 +0000 (20:01 +0000)]
am
20048318: am
aa754868: am
6ec35451: Merge "Add missing paren in "java -version" check"
* commit '
20048318cda49fc9412be8fb2349354313090240':
Add missing paren in "java -version" check
Ying Wang [Tue, 21 Jan 2014 19:58:09 +0000 (19:58 +0000)]
am
aa754868: am
6ec35451: Merge "Add missing paren in "java -version" check"
* commit '
aa7548683bcd254e50cffc5baf00994e58919d64':
Add missing paren in "java -version" check
Ying Wang [Tue, 21 Jan 2014 19:54:58 +0000 (11:54 -0800)]
am
6ec35451: Merge "Add missing paren in "java -version" check"
* commit '
6ec3545158f49f521c53c9474cfb28c1a1811fd3':
Add missing paren in "java -version" check
Ying Wang [Tue, 21 Jan 2014 19:47:51 +0000 (19:47 +0000)]
Merge "Add missing paren in "java -version" check"
Ying Wang [Sat, 18 Jan 2014 00:17:28 +0000 (16:17 -0800)]
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
Brian Carlstrom [Tue, 21 Jan 2014 07:48:45 +0000 (23:48 -0800)]
Add missing paren in "java -version" check
Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
Robert Craig [Fri, 17 Jan 2014 14:13:50 +0000 (09:13 -0500)]
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>
Ying Wang [Fri, 17 Jan 2014 00:21:03 +0000 (16:21 -0800)]
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
Ying Wang [Thu, 16 Jan 2014 20:36:34 +0000 (12:36 -0800)]
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
Ying Wang [Thu, 16 Jan 2014 23:25:03 +0000 (23:25 +0000)]
Merge "Set up rules to build static libraries for TARGET_2ND_ARCH"
Ying Wang [Thu, 16 Jan 2014 23:24:41 +0000 (23:24 +0000)]
Merge "Load compiler environment for a second arch."
Ying Wang [Thu, 16 Jan 2014 00:02:16 +0000 (16:02 -0800)]
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
Ying Wang [Fri, 27 Dec 2013 19:09:36 +0000 (11:09 -0800)]
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
Doug Zongker [Thu, 16 Jan 2014 20:43:19 +0000 (12:43 -0800)]
add the uncrypt binary to device builds
The uncrypt binary needs to be present on any device which reboots
into recovery.
Change-Id: I684a279484876e8a596829e41218095a793ea26b
Chet Haase [Thu, 16 Jan 2014 17:55:15 +0000 (17:55 +0000)]
am
585ce19d: Add recyclerview to support libs docs
* commit '
585ce19d9d6b9feac75baa646b507dbd35085f7c':
Add recyclerview to support libs docs
Chet Haase [Thu, 16 Jan 2014 15:53:43 +0000 (07:53 -0800)]
Add recyclerview to support libs docs
Change-Id: Ibe863e4b1930670353e6e0658fbc83e694dec3a4
Ying Wang [Thu, 16 Jan 2014 01:17:22 +0000 (01:17 +0000)]
am
4339ad4a: am
da9ef76b: am
a296a71e: am
166bc090: Merge "[MIPS] Reenable linker fatal-warnings"
* commit '
4339ad4ac1e0170c7c7497c2b3480b2154fcd8ac':
[MIPS] Reenable linker fatal-warnings
Ying Wang [Thu, 16 Jan 2014 01:14:11 +0000 (01:14 +0000)]
am
da9ef76b: am
a296a71e: am
166bc090: Merge "[MIPS] Reenable linker fatal-warnings"
* commit '
da9ef76b5d66053edccd946dc93dd4134b2c9e29':
[MIPS] Reenable linker fatal-warnings
Ying Wang [Thu, 16 Jan 2014 01:11:15 +0000 (01:11 +0000)]
am
a296a71e: am
166bc090: Merge "[MIPS] Reenable linker fatal-warnings"
* commit '
a296a71e0c344e95f2d4dfe59d850a55130fe58a':
[MIPS] Reenable linker fatal-warnings
Ying Wang [Thu, 16 Jan 2014 01:08:22 +0000 (17:08 -0800)]
am
166bc090: Merge "[MIPS] Reenable linker fatal-warnings"
* commit '
166bc090ab0ac7ac7a620889fd96656be4ca69c1':
[MIPS] Reenable linker fatal-warnings
Ying Wang [Thu, 16 Jan 2014 01:02:58 +0000 (01:02 +0000)]
Merge "[MIPS] Reenable linker fatal-warnings"
Chris Dearman [Wed, 15 Jan 2014 06:35:13 +0000 (22:35 -0800)]
[MIPS] Reenable linker fatal-warnings
Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
Ben Cheng [Wed, 15 Jan 2014 00:18:11 +0000 (00:18 +0000)]
am
cbb9c761: am
27c9f861: am
1703474f: am
365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu."
* commit '
cbb9c76174f4da90d5311f75f808c9b570dc5bc8':
Add aosp_aarch64-eng to the default lunch menu.
Ben Cheng [Wed, 15 Jan 2014 00:14:56 +0000 (00:14 +0000)]
am
27c9f861: am
1703474f: am
365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu."
* commit '
27c9f861028a23300d5d27f73be5be36247e0569':
Add aosp_aarch64-eng to the default lunch menu.
Ben Cheng [Wed, 15 Jan 2014 00:12:02 +0000 (00:12 +0000)]
am
1703474f: am
365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu."
* commit '
1703474f4ce5510b10f43babc8afba553013c90b':
Add aosp_aarch64-eng to the default lunch menu.
Ben Cheng [Wed, 15 Jan 2014 00:08:43 +0000 (16:08 -0800)]
am
365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu."
* commit '
365e443995b2b33eae23ff0423a042eb52e64326':
Add aosp_aarch64-eng to the default lunch menu.
Ben Cheng [Wed, 15 Jan 2014 00:01:12 +0000 (00:01 +0000)]
Merge "Add aosp_aarch64-eng to the default lunch menu."
Ben Cheng [Tue, 14 Jan 2014 23:55:03 +0000 (15:55 -0800)]
Add aosp_aarch64-eng to the default lunch menu.
Change-Id: I55f6ab6ea90670def30796fdce76c27031ecef01
Ying Wang [Tue, 14 Jan 2014 23:47:11 +0000 (23:47 +0000)]
am
e6036aa6: am
c4f4a532: am
14af5526: am
c4c71f06: Merge "Remove aprof support from the build system."
* commit '
e6036aa6ff8cde9fad959ed42bec8cce0350c5e6':
Remove aprof support from the build system.
Ying Wang [Tue, 14 Jan 2014 23:45:09 +0000 (23:45 +0000)]
am
c4f4a532: am
14af5526: am
c4c71f06: Merge "Remove aprof support from the build system."
* commit '
c4f4a5325f1d5ed00a84b7163b0a03d607a33684':
Remove aprof support from the build system.
Ying Wang [Tue, 14 Jan 2014 23:42:33 +0000 (23:42 +0000)]
am
14af5526: am
c4c71f06: Merge "Remove aprof support from the build system."
* commit '
14af5526b5001431af49e40be049b5475de64f15':
Remove aprof support from the build system.
Ying Wang [Tue, 14 Jan 2014 23:36:57 +0000 (15:36 -0800)]
am
c4c71f06: Merge "Remove aprof support from the build system."
* commit '
c4c71f06ab002c4b12042ba7752272311b62b0f9':
Remove aprof support from the build system.
Ying Wang [Tue, 14 Jan 2014 23:33:34 +0000 (23:33 +0000)]
Merge "Remove aprof support from the build system."
Ying Wang [Tue, 14 Jan 2014 22:26:05 +0000 (14:26 -0800)]
Remove aprof support from the build system.
This reverts the commit
70dc3e1d.
Change-Id: I480b005579805d2608d05dac41e32bb44642e813
Ying Wang [Tue, 14 Jan 2014 20:15:45 +0000 (20:15 +0000)]
am
94ff79ea: am
adc66128: am
b6c57051: am
f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit '
94ff79eaf2d66be4c83656a41b4efa38ad34a970':
Install 64-bit libraries to /system/lib64.
Ying Wang [Tue, 14 Jan 2014 20:12:58 +0000 (20:12 +0000)]
am
adc66128: am
b6c57051: am
f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit '
adc66128dc595c4138ac799935334884f75ed7a1':
Install 64-bit libraries to /system/lib64.
Ying Wang [Tue, 14 Jan 2014 20:10:16 +0000 (20:10 +0000)]
am
b6c57051: am
f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit '
b6c570510aa1d2747538fe734292873ed13f5b67':
Install 64-bit libraries to /system/lib64.
Ying Wang [Tue, 14 Jan 2014 20:08:32 +0000 (12:08 -0800)]
am
f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit '
f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c':
Install 64-bit libraries to /system/lib64.
Ying Wang [Tue, 14 Jan 2014 20:03:19 +0000 (20:03 +0000)]
Merge "Install 64-bit libraries to /system/lib64."
Ying Wang [Tue, 14 Jan 2014 00:14:20 +0000 (16:14 -0800)]
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
Elliott Hughes [Sat, 11 Jan 2014 00:57:27 +0000 (00:57 +0000)]
am
17657ec7: am
538009b2: am
dda9d8ee: am
37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
* commit '
17657ec7f71a7be5c71f3b42b217d9ec45079f3b':
Remove obsolete CUSTOM_KERNEL_HEADERS.
Elliott Hughes [Sat, 11 Jan 2014 00:53:43 +0000 (00:53 +0000)]
am
538009b2: am
dda9d8ee: am
37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
* commit '
538009b26cee4251b33c36f6c70fc8f703c695af':
Remove obsolete CUSTOM_KERNEL_HEADERS.
Elliott Hughes [Sat, 11 Jan 2014 00:50:44 +0000 (00:50 +0000)]
am
dda9d8ee: am
37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
* commit '
dda9d8ee0fe580d663a4eaed49be5d39c3de2882':
Remove obsolete CUSTOM_KERNEL_HEADERS.
Elliott Hughes [Sat, 11 Jan 2014 00:47:30 +0000 (16:47 -0800)]
am
37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
* commit '
37c699c28a464561b186ab11a5af60214ae25d9a':
Remove obsolete CUSTOM_KERNEL_HEADERS.
Elliott Hughes [Sat, 11 Jan 2014 00:41:24 +0000 (00:41 +0000)]
Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
Elliott Hughes [Sat, 11 Jan 2014 00:35:08 +0000 (16:35 -0800)]
Remove obsolete CUSTOM_KERNEL_HEADERS.
Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
Ying Wang [Fri, 10 Jan 2014 17:45:43 +0000 (17:45 +0000)]
am
b3681d13: am
ee2a10eb: am
0650d4a2: am
987616ed: Merge "Fix x86_64 build"
* commit '
b3681d1351086ba4dffa4752ac2114c7d8915914':
Fix x86_64 build
Ying Wang [Fri, 10 Jan 2014 17:42:30 +0000 (17:42 +0000)]
am
ee2a10eb: am
0650d4a2: am
987616ed: Merge "Fix x86_64 build"
* commit '
ee2a10eb18a5e79fa958afc2d09c65e21c34e174':
Fix x86_64 build
Ying Wang [Fri, 10 Jan 2014 17:40:26 +0000 (17:40 +0000)]
am
0650d4a2: am
987616ed: Merge "Fix x86_64 build"
* commit '
0650d4a2eadc96577b2e03fbda000ed5a340d8ac':
Fix x86_64 build
Ying Wang [Fri, 10 Jan 2014 17:38:13 +0000 (09:38 -0800)]
am
987616ed: Merge "Fix x86_64 build"
* commit '
987616ed09adc65e6636f7a3a82fa7b38021b6e2':
Fix x86_64 build
Ying Wang [Fri, 10 Jan 2014 17:33:12 +0000 (17:33 +0000)]
Merge "Fix x86_64 build"
Pavel Chupin [Fri, 10 Jan 2014 15:23:08 +0000 (19:23 +0400)]
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>
Brian Carlstrom [Fri, 10 Jan 2014 02:42:36 +0000 (02:42 +0000)]
am
6e984e2d: am
1df8d179: am
98c72521: am
ad8271a8: Merge "Add support for ALTERNATE_JAVAC"
* commit '
6e984e2d8cfc3ac7affa59e8b7440c8e5fc8b16f':
Add support for ALTERNATE_JAVAC
Brian Carlstrom [Fri, 10 Jan 2014 02:40:34 +0000 (02:40 +0000)]
am
1df8d179: am
98c72521: am
ad8271a8: Merge "Add support for ALTERNATE_JAVAC"
* commit '
1df8d17911ce14b9c32634e5d10ec389efaf4ed0':
Add support for ALTERNATE_JAVAC
Brian Carlstrom [Fri, 10 Jan 2014 02:39:02 +0000 (02:39 +0000)]
am
98c72521: am
ad8271a8: Merge "Add support for ALTERNATE_JAVAC"
* commit '
98c7252113ad4adfc11bb500d737b96c0544106f':
Add support for ALTERNATE_JAVAC
Brian Carlstrom [Fri, 10 Jan 2014 02:36:22 +0000 (18:36 -0800)]
am
ad8271a8: Merge "Add support for ALTERNATE_JAVAC"
* commit '
ad8271a8e6a1f050c1852d6dc3df0eb6777e5606':
Add support for ALTERNATE_JAVAC
Brian Carlstrom [Fri, 10 Jan 2014 02:31:25 +0000 (02:31 +0000)]
Merge "Add support for ALTERNATE_JAVAC"
Ying Wang [Fri, 10 Jan 2014 01:54:28 +0000 (01:54 +0000)]
am
d19496b1: am
02e4bb6b: am
cb5f9a28: am
a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."
* commit '
d19496b134ff56167266566920acf93867b8972d':
Define PRIVATE_TARGET_ variables for only target modules.
Ying Wang [Fri, 10 Jan 2014 00:37:04 +0000 (00:37 +0000)]
am
02e4bb6b: am
cb5f9a28: am
a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."
* commit '
02e4bb6b10f33eb7ea54dbb6cffc20690fe9b18f':
Define PRIVATE_TARGET_ variables for only target modules.
Ying Wang [Fri, 10 Jan 2014 00:34:56 +0000 (00:34 +0000)]
am
cb5f9a28: am
a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."
* commit '
cb5f9a282e713096104e9d7b18bb028f926dbd2a':
Define PRIVATE_TARGET_ variables for only target modules.
Ying Wang [Fri, 10 Jan 2014 00:32:07 +0000 (16:32 -0800)]
am
a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."
* commit '
a26ea82e6a226575f19fec6b5bea111cbe20c233':
Define PRIVATE_TARGET_ variables for only target modules.
Ying Wang [Fri, 10 Jan 2014 00:27:51 +0000 (00:27 +0000)]
Merge "Define PRIVATE_TARGET_ variables for only target modules."
Brian Carlstrom [Thu, 9 Jan 2014 23:33:06 +0000 (15:33 -0800)]
Add support for ALTERNATE_JAVAC
Bug:
12476356
Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4
OSDN Git Service
