OSDN Git Service
Colin Cross [Fri, 24 Jan 2014 20:48:20 +0000 (20:48 +0000)]
am
5119fcfc: am
f81cc531: am
d5227a83: Merge "build: rename aarch64 target to arm64"
* commit '
5119fcfc2052e9f3a5d4415759fb5bf252d651e8':
build: rename aarch64 target to arm64
Colin Cross [Fri, 24 Jan 2014 20:45:41 +0000 (20:45 +0000)]
am
f81cc531: am
d5227a83: Merge "build: rename aarch64 target to arm64"
* commit '
f81cc531b41617b91ef2c46b7f2fb1bf1abb8dc7':
build: rename aarch64 target to arm64
Colin Cross [Fri, 24 Jan 2014 20:42:35 +0000 (12:42 -0800)]
am
d5227a83: Merge "build: rename aarch64 target to arm64"
* commit '
d5227a833cde624532ec34e8b25c29af001e427f':
build: rename aarch64 target to arm64
Colin Cross [Fri, 24 Jan 2014 20:33:59 +0000 (20:33 +0000)]
Merge "build: rename aarch64 target to arm64"
Colin Cross [Wed, 22 Jan 2014 03:35:38 +0000 (19:35 -0800)]
build: rename aarch64 target to arm64
Rename aarch64 build targets to arm64. The gcc toolchain is still
aarch64.
Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
David Turner [Fri, 24 Jan 2014 05:47:17 +0000 (05:47 +0000)]
am
327c3fef: am
fa2c68e8: am
51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '
327c3fef766052c4e8d492d2102a39deb3bdcaa4':
Vibra: compile and stage vibrator.default on all targets
David Turner [Fri, 24 Jan 2014 05:47:17 +0000 (05:47 +0000)]
am
146cce0e: am
cdecaca3: am
dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit '
146cce0ebccd5381dad9394dad350f968652c23a':
Vibra: emulator: compile and stage vibrator.goldfish
David Turner [Fri, 24 Jan 2014 05:44:04 +0000 (05:44 +0000)]
am
fa2c68e8: am
51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '
fa2c68e81a356556298f7bab21a29c14f99f3051':
Vibra: compile and stage vibrator.default on all targets
David Turner [Fri, 24 Jan 2014 05:44:03 +0000 (05:44 +0000)]
am
cdecaca3: am
dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit '
cdecaca3017e902002627e68d40d09f00224baf8':
Vibra: emulator: compile and stage vibrator.goldfish
David Turner [Fri, 24 Jan 2014 05:36:34 +0000 (21:36 -0800)]
am
51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '
51c47855f01223b88e1eb134504782695867301f':
Vibra: compile and stage vibrator.default on all targets
David Turner [Fri, 24 Jan 2014 05:36:33 +0000 (21:36 -0800)]
am
dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit '
dfc140cd3f31b4f02c807cc1aa6e85d8db87a324':
Vibra: emulator: compile and stage vibrator.goldfish
David Turner [Fri, 24 Jan 2014 05:33:08 +0000 (05:33 +0000)]
Merge "Vibra: compile and stage vibrator.default on all targets"
David Turner [Fri, 24 Jan 2014 05:32:54 +0000 (05:32 +0000)]
Merge "Vibra: emulator: compile and stage vibrator.goldfish"
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
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: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: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: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
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: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"
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>
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: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: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: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: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: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: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>
David Wagner [Mon, 30 Dec 2013 13:30:37 +0000 (14:30 +0100)]
Vibra: compile and stage vibrator.default on all targets
Add the vibrator.default package to all targets deriving from
generic_no_telephony, i.e. virtually all targets.
This change is related to other changes in:
- hardware/libhardware
- hardware/libhardware_legacy
- frameworks/base
- device/generic/goldfish
Change-Id: Ic8464844e12f7d31ca49597dfc4995b13e9ff419
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
Author-tracking-BZ: 94611
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 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
Ying Wang [Thu, 9 Jan 2014 22:39:41 +0000 (14:39 -0800)]
Define PRIVATE_TARGET_ variables for only target modules.
Change-Id: I12c54bfffd9acb78a61d1032a087a0edaf3bf12c
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.
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.
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.
Ying Wang [Thu, 9 Jan 2014 18:52:06 +0000 (18:52 +0000)]
Merge "Allow clang to build host binaries."
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
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
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
Narayan Kamath [Wed, 8 Jan 2014 09:59:55 +0000 (09:59 +0000)]
Merge "Remove libSR_AudioIn from base.mk"
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
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
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
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
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"
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
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
Logan Chien [Tue, 10 Dec 2013 11:07:41 +0000 (19:07 +0800)]
Allow clang to build host binaries.
Change-Id: I7e4f9dc6f69a97cfefdfa2ed55c5d7b8ad496da7
OSDN Git Service
