OSDN Git Service

android-x86/build.git
10 years agobuild: print module that has unhandled install path
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

10 years agobuild: use arm kernel headers for arm 2nd arch builds
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

10 years agoMerge "Support to build executables for TARGET_2ND_ARCH"
Ying Wang [Tue, 21 Jan 2014 21:24:01 +0000 (21:24 +0000)]
Merge "Support to build executables for TARGET_2ND_ARCH"

10 years agoam 6e8e82ea: am 10515519: am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when check...
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.

10 years agoam 10515519: am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks...
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.

10 years agoam 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_CO...
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.

10 years agoam 8d1f91fa: Merge "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.

10 years agoMerge "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."

10 years agoresolved conflicts for merge of 5f95f442 to master
Ying Wang [Tue, 21 Jan 2014 20:17:11 +0000 (12:17 -0800)]
resolved conflicts for merge of 5f95f442 to master

Change-Id: I498e37f711084a0f86f6dcb6dcd2d94ab8e1896d

10 years agoam 20048318: am aa754868: am 6ec35451: Merge "Add missing paren in "java -version...
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

10 years agoam aa754868: am 6ec35451: Merge "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

10 years agoam 6ec35451: Merge "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

10 years agoMerge "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"

10 years agoSupport to build executables for TARGET_2ND_ARCH
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

10 years agoAdd missing paren in "java -version" check
Brian Carlstrom [Tue, 21 Jan 2014 07:48:45 +0000 (23:48 -0800)]
Add missing paren in "java -version" check

Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db

10 years agoFix filter rule when checking for apks in PRODUCT_COPY_FILES.
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>
10 years agoReplace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
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

10 years agoSet up rules to build shared libraries for TARGET_2ND_ARCH
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

10 years agoMerge "Set up rules to build static libraries for TARGET_2ND_ARCH"
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"

10 years agoMerge "Load compiler environment for a second arch."
Ying Wang [Thu, 16 Jan 2014 23:24:41 +0000 (23:24 +0000)]
Merge "Load compiler environment for a second arch."

10 years agoSet up rules to build static libraries for TARGET_2ND_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

10 years agoLoad compiler environment for a second arch.
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

10 years agoadd the uncrypt binary to device builds
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

10 years agoam 585ce19d: Add recyclerview to support libs docs
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

10 years agoAdd 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

10 years agoam 4339ad4a: am da9ef76b: am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker...
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

10 years agoam da9ef76b: am a296a71e: am 166bc090: Merge "[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

10 years agoam a296a71e: am 166bc090: Merge "[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

10 years agoam 166bc090: Merge "[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

10 years agoMerge "[MIPS] Reenable linker fatal-warnings"
Ying Wang [Thu, 16 Jan 2014 01:02:58 +0000 (01:02 +0000)]
Merge "[MIPS] Reenable linker fatal-warnings"

10 years ago[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

10 years agoam cbb9c761: am 27c9f861: am 1703474f: am 365e4439: Merge "Add aosp_aarch64-eng to...
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.

10 years agoam 27c9f861: am 1703474f: am 365e4439: Merge "Add aosp_aarch64-eng to the default...
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.

10 years agoam 1703474f: am 365e4439: Merge "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.

10 years agoam 365e4439: Merge "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.

10 years agoMerge "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."

10 years agoAdd 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

10 years agoam e6036aa6: am c4f4a532: am 14af5526: am c4c71f06: Merge "Remove aprof support from...
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.

10 years agoam c4f4a532: am 14af5526: am c4c71f06: Merge "Remove aprof support from the build...
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.

10 years agoam 14af5526: am c4c71f06: Merge "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.

10 years agoam c4c71f06: Merge "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.

10 years agoMerge "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."

10 years agoRemove 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

10 years agoam 94ff79ea: am adc66128: am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries...
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.

10 years agoam adc66128: am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system...
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.

10 years agoam b6c57051: am f5ce4fa9: Merge "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.

10 years agoam f5ce4fa9: Merge "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.

10 years agoMerge "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."

10 years agoInstall 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

10 years agoam 17657ec7: am 538009b2: am dda9d8ee: am 37c699c2: Merge "Remove obsolete CUSTOM_KER...
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.

10 years agoam 538009b2: am dda9d8ee: am 37c699c2: Merge "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.

10 years agoam dda9d8ee: am 37c699c2: Merge "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.

10 years agoam 37c699c2: Merge "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.

10 years agoMerge "Remove obsolete CUSTOM_KERNEL_HEADERS."
Elliott Hughes [Sat, 11 Jan 2014 00:41:24 +0000 (00:41 +0000)]
Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."

10 years agoRemove 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

10 years agoam b3681d13: am ee2a10eb: am 0650d4a2: am 987616ed: Merge "Fix x86_64 build"
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

10 years agoam ee2a10eb: am 0650d4a2: am 987616ed: Merge "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

10 years agoam 0650d4a2: am 987616ed: Merge "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

10 years agoam 987616ed: Merge "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

10 years agoMerge "Fix x86_64 build"
Ying Wang [Fri, 10 Jan 2014 17:33:12 +0000 (17:33 +0000)]
Merge "Fix x86_64 build"

10 years agoFix 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>
10 years agoam 6e984e2d: am 1df8d179: am 98c72521: am ad8271a8: Merge "Add support for ALTERNATE_...
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

10 years agoam 1df8d179: am 98c72521: am ad8271a8: Merge "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

10 years agoam 98c72521: am ad8271a8: Merge "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

10 years agoam ad8271a8: Merge "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

10 years agoMerge "Add support for ALTERNATE_JAVAC"
Brian Carlstrom [Fri, 10 Jan 2014 02:31:25 +0000 (02:31 +0000)]
Merge "Add support for ALTERNATE_JAVAC"

10 years agoam d19496b1: am 02e4bb6b: am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_...
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.

10 years agoam 02e4bb6b: am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for...
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.

10 years agoam cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target...
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.

10 years agoam a26ea82e: Merge "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.

10 years agoMerge "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."

10 years agoAdd support for ALTERNATE_JAVAC
Brian Carlstrom [Thu, 9 Jan 2014 23:33:06 +0000 (15:33 -0800)]
Add support for ALTERNATE_JAVAC

Bug: 12476356
Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4

10 years agoDefine PRIVATE_TARGET_ variables for only target modules.
Ying Wang [Thu, 9 Jan 2014 22:39:41 +0000 (14:39 -0800)]
Define PRIVATE_TARGET_ variables for only target modules.

Change-Id: I12c54bfffd9acb78a61d1032a087a0edaf3bf12c

10 years agoReconcile the merge.
Ying Wang [Thu, 9 Jan 2014 19:42:04 +0000 (11:42 -0800)]
Reconcile the merge.

Change-Id: If3edaedc417e390005b83cbf649b5c1f07a2ea82

10 years agoresolved conflicts for merge of 948786c9 to master
Ying Wang [Thu, 9 Jan 2014 19:12:12 +0000 (11:12 -0800)]
resolved conflicts for merge of 948786c9 to master

Conflicts:
core/llvm_config.mk

Change-Id: Icfe11ad432c39efdf281ba0ab3cffb1011789cce

10 years agoam fb5ae89f: am b5fb7f24: am aed49987: Merge "Allow clang to build host binaries."
Ying Wang [Thu, 9 Jan 2014 19:03:04 +0000 (19:03 +0000)]
am fb5ae89f: am b5fb7f24: am aed49987: Merge "Allow clang to build host binaries."

* commit 'fb5ae89feaaca7af3c8409a52ee015b8821668fd':
  Allow clang to build host binaries.

10 years agoam b5fb7f24: am aed49987: Merge "Allow clang to build host binaries."
Ying Wang [Thu, 9 Jan 2014 19:00:15 +0000 (19:00 +0000)]
am b5fb7f24: am aed49987: Merge "Allow clang to build host binaries."

* commit 'b5fb7f242e925f482557227623120f1e4480beba':
  Allow clang to build host binaries.

10 years agoam aed49987: Merge "Allow clang to build host binaries."
Ying Wang [Thu, 9 Jan 2014 18:57:03 +0000 (10:57 -0800)]
am aed49987: Merge "Allow clang to build host binaries."

* commit 'aed499879210c7432c1c5b3869f383b27b17dafc':
  Allow clang to build host binaries.

10 years agoMerge "Allow clang to build host binaries."
Ying Wang [Thu, 9 Jan 2014 18:52:06 +0000 (18:52 +0000)]
Merge "Allow clang to build host binaries."

10 years agoMove Wifi services to a new git project
Vinit Deshapnde [Wed, 8 Jan 2014 18:43:31 +0000 (10:43 -0800)]
Move Wifi services to a new git project

Bug: 12175455
Change-Id: I1fa07e29c6a9aae38d9e334d519a9f2445d15613

10 years agoam f57caaa3: am fa0e1626: am 6ab8c86b: am 8530e25f: Merge "Remove libSR_AudioIn from...
Narayan Kamath [Wed, 8 Jan 2014 10:12:12 +0000 (10:12 +0000)]
am f57caaa3: am fa0e1626: am 6ab8c86b: am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"

* commit 'f57caaa32e473010c30ae97326c632e08791d6d1':
  Remove libSR_AudioIn from base.mk

10 years agoam fa0e1626: am 6ab8c86b: am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"
Narayan Kamath [Wed, 8 Jan 2014 10:10:02 +0000 (10:10 +0000)]
am fa0e1626: am 6ab8c86b: am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"

* commit 'fa0e1626bdd0964f6f9665c41df66ef27ef32caf':
  Remove libSR_AudioIn from base.mk

10 years agoam 6ab8c86b: am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"
Narayan Kamath [Wed, 8 Jan 2014 10:07:49 +0000 (10:07 +0000)]
am 6ab8c86b: am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"

* commit '6ab8c86b56a5914f30f95b73ab906de3295da03e':
  Remove libSR_AudioIn from base.mk

10 years agoam 8530e25f: Merge "Remove libSR_AudioIn from base.mk"
Narayan Kamath [Wed, 8 Jan 2014 10:05:12 +0000 (02:05 -0800)]
am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"

* commit '8530e25ff666987c7c968c2a323a8b1e7867bcca':
  Remove libSR_AudioIn from base.mk

10 years agoMerge "Remove libSR_AudioIn from base.mk"
Narayan Kamath [Wed, 8 Jan 2014 09:59:55 +0000 (09:59 +0000)]
Merge "Remove libSR_AudioIn from base.mk"

10 years agoam c7471757: Now PRODUCT_BOOT_JARS is a list of jar names.
Ying Wang [Wed, 8 Jan 2014 01:26:04 +0000 (01:26 +0000)]
am c7471757: Now PRODUCT_BOOT_JARS is a list of jar names.

* commit 'c74717574fab08700f657a3f5ebf8934cf4572c7':
  Now PRODUCT_BOOT_JARS is a list of jar names.

10 years agoNow PRODUCT_BOOT_JARS is a list of jar names.
Ying Wang [Wed, 8 Jan 2014 01:22:10 +0000 (17:22 -0800)]
Now PRODUCT_BOOT_JARS is a list of jar names.

See commit ad6674cd6003b78ef8ba101eb8a6b3c889ae4b0d.

Change-Id: I5e45c400644b6b98dcf64d96eb2425cdbafb3021

10 years agoam a292b7b0: am 83709a21: am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a...
Ying Wang [Wed, 8 Jan 2014 01:01:21 +0000 (01:01 +0000)]
am a292b7b0: am 83709a21: am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"

* commit 'a292b7b02bdf051df9eebbe4a51c6a55ce91a7a2':
  PRODUCT_BOOT_JARS as a list of jar names separated by space

10 years agoam 83709a21: am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar...
Ying Wang [Wed, 8 Jan 2014 00:58:31 +0000 (00:58 +0000)]
am 83709a21: am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"

* commit '83709a21c1cd3cd30f193ebcb8001344647329e5':
  PRODUCT_BOOT_JARS as a list of jar names separated by space

10 years agoam 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated...
Ying Wang [Wed, 8 Jan 2014 00:53:31 +0000 (00:53 +0000)]
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

10 years agoam f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
Ying Wang [Wed, 8 Jan 2014 00:50:49 +0000 (16:50 -0800)]
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

10 years agoMerge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
Ying Wang [Wed, 8 Jan 2014 00:45:15 +0000 (00:45 +0000)]
Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"

10 years agoPRODUCT_BOOT_JARS as a list of jar names separated by space
Ying Wang [Tue, 7 Jan 2014 22:31:49 +0000 (14:31 -0800)]
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

10 years agoRemove libSR_AudioIn from base.mk
Narayan Kamath [Tue, 7 Jan 2014 10:06:13 +0000 (10:06 +0000)]
Remove libSR_AudioIn from base.mk

This is an obsolete rule that was grandfathered in because
it was a USER module at some point. It's no longer
required, even by builds that use packages/app/VoiceDialer.

Change-Id: Ife9e89bd1b03c0364e27650863a83bad945b8089

10 years agoAllow clang to build host binaries.
Logan Chien [Tue, 10 Dec 2013 11:07:41 +0000 (19:07 +0800)]
Allow clang to build host binaries.

Change-Id: I7e4f9dc6f69a97cfefdfa2ed55c5d7b8ad496da7

10 years agoam 1dd90e33: am a2466857: build lmkd
Todd Poynor [Mon, 6 Jan 2014 21:31:24 +0000 (21:31 +0000)]
am 1dd90e33: am a2466857: build lmkd

* commit '1dd90e33f8979141d131a548c032703522741808':
  build lmkd

10 years agoam a2466857: build lmkd
Todd Poynor [Mon, 6 Jan 2014 21:28:57 +0000 (21:28 +0000)]
am a2466857: build lmkd

* commit 'a2466857412d3abe8351f7339d4b658ab0c899b8':
  build lmkd

10 years agobuild lmkd
Todd Poynor [Wed, 10 Jul 2013 22:22:53 +0000 (15:22 -0700)]
build lmkd

Change-Id: I5e7c785d3f76ec2d0f30ae6aa948436f5d04957b

10 years agoMerge "Fix up android.core CTS tests."
Narayan Kamath [Mon, 6 Jan 2014 11:00:31 +0000 (11:00 +0000)]
Merge "Fix up android.core CTS tests."

10 years agoam 65cd1e95: am b86c34ae: am f05eecc3: am a47d12e3: Merge "Remove LOCAL_SRC_FILES...
Ying Wang [Sat, 4 Jan 2014 02:08:59 +0000 (02:08 +0000)]
am 65cd1e95: am b86c34ae: am f05eecc3: am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"

* commit '65cd1e953574e81f3fe9eb0e32eea0c43cac26ec':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt