OSDN Git Service
Ying Wang [Tue, 19 Jun 2012 21:27:31 +0000 (14:27 -0700)]
am
0872a010: Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev
* commit '
0872a010659d20633f07f4ef54cf61f8e4b6e030':
More flexibility to keep/remove R.class in static Java library
Ying Wang [Tue, 19 Jun 2012 21:25:14 +0000 (14:25 -0700)]
Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev
Jean-Baptiste Queru [Tue, 19 Jun 2012 18:27:26 +0000 (11:27 -0700)]
am
03bb0851: Remove references to packages that don\'t exist any more.
* commit '
03bb0851d6a86ac51becaa132f96ed1d8f4b604c':
Remove references to packages that don't exist any more.
Jean-Baptiste Queru [Tue, 19 Jun 2012 18:17:27 +0000 (11:17 -0700)]
Remove references to packages that don't exist any more.
Those can't be found anywhere in the build system.
Change-Id: I3b3727e7735de0dbffae930cf99a6d6ccbc79570
Ying Wang [Tue, 19 Jun 2012 17:40:37 +0000 (10:40 -0700)]
More flexibility to keep/remove R.class in static Java library
- Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your
Android.mk, if your static library is directly used by an app.
- If your library will be included by another library that need
reference the R/Manifest class, you can set
LOCAL_JAR_EXCLUDE_FILES := none
to keep the generated classes.
- If your library includes another static library that has Android
resource and you want to remove the generated classes carried by
the static library, set:
LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES)
With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old
long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY.
Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
The Android Open Source Project [Tue, 19 Jun 2012 14:15:29 +0000 (07:15 -0700)]
Reconcile with jb-release
Change-Id: Id011e3aaae44e404d9e7b75e5a52f097d2317126
The Android Automerger [Tue, 19 Jun 2012 14:10:41 +0000 (07:10 -0700)]
JRN80
The Android Automerger [Tue, 19 Jun 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 13:13:10 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: I7cea6b7dd25e75e4b0a738cfa890fcaa556c2d0b
The Android Automerger [Mon, 18 Jun 2012 23:27:50 +0000 (16:27 -0700)]
JRN79C
The Android Automerger [Mon, 18 Jun 2012 22:54:58 +0000 (15:54 -0700)]
JRN79B
Guang Zhu [Mon, 18 Jun 2012 18:55:49 +0000 (11:55 -0700)]
am
5d76a3f2: Merge "add uiautomator into system image" into jb-dev
* commit '
5d76a3f2d53fceb883d84d214c28c51bc3e5b43c':
add uiautomator into system image
Guang Zhu [Mon, 18 Jun 2012 18:52:42 +0000 (11:52 -0700)]
Merge "add uiautomator into system image" into jb-dev
Ying Wang [Mon, 18 Jun 2012 17:33:33 +0000 (10:33 -0700)]
am
43ca4a45: Remove the user tag and legacy prebuilts for the srec modules.
* commit '
43ca4a45a43e2084b5a40af90ff523b0417d31c0':
Remove the user tag and legacy prebuilts for the srec modules.
The Android Automerger [Mon, 18 Jun 2012 14:06:59 +0000 (07:06 -0700)]
JRN79
The Android Automerger [Mon, 18 Jun 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 18 Jun 2012 00:06:48 +0000 (17:06 -0700)]
JRN78B
The Android Automerger [Sun, 17 Jun 2012 14:08:19 +0000 (07:08 -0700)]
JRN78
The Android Automerger [Sun, 17 Jun 2012 13:59:26 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Guang Zhu [Fri, 15 Jun 2012 21:46:26 +0000 (14:46 -0700)]
add uiautomator into system image
this includes 2 pieces:
* uiautomator shell script
* uiautomator.jar: test runner and the automation framework
classes
source is under frameworks/testing/uiautomator
Change-Id: I237d85b8917d2451cf35362d2e34786940897921
The Android Automerger [Sat, 16 Jun 2012 14:11:00 +0000 (07:11 -0700)]
JRN77
The Android Automerger [Sat, 16 Jun 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Thu, 14 Jun 2012 22:04:59 +0000 (15:04 -0700)]
Remove the user tag and legacy prebuilts for the srec modules.
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
The Android Automerger [Fri, 15 Jun 2012 23:17:07 +0000 (16:17 -0700)]
JRN75E
The Android Automerger [Fri, 15 Jun 2012 21:13:01 +0000 (14:13 -0700)]
JRN75D
The Android Automerger [Thu, 14 Jun 2012 23:48:04 +0000 (16:48 -0700)]
JRN75C
The Android Automerger [Thu, 14 Jun 2012 20:29:21 +0000 (13:29 -0700)]
JRN75B
Jean-Baptiste Queru [Thu, 14 Jun 2012 16:24:18 +0000 (09:24 -0700)]
am
74aba614: Allow additional vendors
* commit '
74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4':
Allow additional vendors
Jean-Baptiste Queru [Thu, 14 Jun 2012 15:31:55 +0000 (08:31 -0700)]
Allow additional vendors
Bug:
6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
The Android Automerger [Thu, 14 Jun 2012 14:09:54 +0000 (07:09 -0700)]
JRN75
The Android Automerger [Thu, 14 Jun 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 14 Jun 2012 01:43:04 +0000 (18:43 -0700)]
JRN74C
Jean-Baptiste Queru [Thu, 14 Jun 2012 00:34:28 +0000 (17:34 -0700)]
am
3e4732a3: am
08779651: Merge "generic_x86: build using the NDK ABI\'s processor features"
* commit '
3e4732a39f63326d267a1af17184556e3977f582':
generic_x86: build using the NDK ABI's processor features
Jean-Baptiste Queru [Thu, 14 Jun 2012 00:31:45 +0000 (17:31 -0700)]
am
08779651: Merge "generic_x86: build using the NDK ABI\'s processor features"
* commit '
0877965170498b2dd3a58f9483cf26d6945c9138':
generic_x86: build using the NDK ABI's processor features
Jean-Baptiste Queru [Thu, 14 Jun 2012 00:17:34 +0000 (17:17 -0700)]
Merge "generic_x86: build using the NDK ABI's processor features"
The Android Automerger [Wed, 13 Jun 2012 23:40:23 +0000 (16:40 -0700)]
JRN74B
The Android Automerger [Wed, 13 Jun 2012 16:03:15 +0000 (09:03 -0700)]
JRN74
The Android Automerger [Wed, 13 Jun 2012 15:26:26 +0000 (08:26 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Baptiste Queru [Wed, 13 Jun 2012 14:42:04 +0000 (07:42 -0700)]
resolved conflicts for merge of
572d0d7d to jb-dev-plus-aosp
Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
Jean-Baptiste Queru [Wed, 13 Jun 2012 14:22:29 +0000 (07:22 -0700)]
am
3f8ff030: Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3"
* commit '
3f8ff030e0c693ca0b1758612ecb571711ec2667':
x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
Jean-Baptiste Queru [Wed, 13 Jun 2012 13:25:00 +0000 (06:25 -0700)]
Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3"
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:52:54 +0000 (15:52 -0700)]
am
d3d78a30: am
a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
* commit '
d3d78a30a4f8dd40fa055577ea2708ab34606cec':
gcc 4.6 requires --copy-dt-needed-entries
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:50:19 +0000 (15:50 -0700)]
am
a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
* commit '
a11ad6c2b3cdf13581c4329679cd3d2952323f6d':
gcc 4.6 requires --copy-dt-needed-entries
Jean-Baptiste Queru [Tue, 12 Jun 2012 22:24:17 +0000 (15:24 -0700)]
Merge "gcc 4.6 requires --copy-dt-needed-entries"
Jean-Baptiste Queru [Tue, 12 Jun 2012 21:57:27 +0000 (14:57 -0700)]
resolved conflicts for merge of
76af0657 to jb-dev-plus-aosp
Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
Jean-Baptiste Queru [Tue, 12 Jun 2012 21:43:56 +0000 (14:43 -0700)]
am
0c6b27fe: Merge "full_x86: use telephony profile"
* commit '
0c6b27fe83a810c5a91c3aa1a4ffc0348d24b5cd':
full_x86: use telephony profile
Jean-Baptiste Queru [Tue, 12 Jun 2012 21:36:04 +0000 (14:36 -0700)]
Merge "full_x86: use telephony profile"
Bruce Beare [Tue, 1 May 2012 21:38:18 +0000 (14:38 -0700)]
full_x86: use telephony profile
Author: Bruce Beare <bruce.j.beare@intel.com>
Change-Id: I3c086f3f38049e9a7cc2e653aa0ee0d2a2ca1a79
Jamie Gennis [Tue, 12 Jun 2012 19:41:26 +0000 (12:41 -0700)]
am
f3b1395a: Merge "Add atrace to core.mk" into jb-dev
* commit '
f3b1395a41a1f882fac74b8a55723af8f77535d0':
Add atrace to core.mk
The Android Automerger [Tue, 12 Jun 2012 18:30:36 +0000 (11:30 -0700)]
JRN73
The Android Automerger [Tue, 12 Jun 2012 18:19:13 +0000 (11:19 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 12 Jun 2012 15:22:39 +0000 (08:22 -0700)]
JRN72D
Jean-Baptiste Queru [Tue, 12 Jun 2012 15:05:22 +0000 (08:05 -0700)]
am
5b7633be: am
06e515dd: Merge "This patch addresses the following issues:"
* commit '
5b7633be4e107888db7b6fc3d50be6aa8eb7f95c':
This patch addresses the following issues:
Jean-Baptiste Queru [Tue, 12 Jun 2012 15:02:30 +0000 (08:02 -0700)]
am
06e515dd: Merge "This patch addresses the following issues:"
* commit '
06e515dd77731c1752b2ea3b1b586bcd893f0927':
This patch addresses the following issues:
Jean-Baptiste Queru [Tue, 12 Jun 2012 14:47:48 +0000 (07:47 -0700)]
Merge "This patch addresses the following issues:"
The Android Automerger [Tue, 12 Jun 2012 00:17:03 +0000 (17:17 -0700)]
JRN72C
The Android Automerger [Mon, 11 Jun 2012 20:24:52 +0000 (13:24 -0700)]
JRN72B
Jamie Gennis [Mon, 11 Jun 2012 19:04:24 +0000 (12:04 -0700)]
Merge "Add atrace to core.mk" into jb-dev
The Android Open Source Project [Mon, 11 Jun 2012 16:20:38 +0000 (09:20 -0700)]
Reconcile with jb-release
Change-Id: Ib5c6014cd943de49130829c7c7c68eebdaccd1f9
The Android Automerger [Mon, 11 Jun 2012 14:09:29 +0000 (07:09 -0700)]
JRN72
The Android Automerger [Mon, 11 Jun 2012 13:59:30 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 8 Jun 2012 22:52:35 +0000 (15:52 -0700)]
JRN69D
Jamie Gennis [Thu, 7 Jun 2012 23:40:30 +0000 (16:40 -0700)]
Add atrace to core.mk
This change adds the atrace binary and init.trace.rc to the system image for
all builds.
Bug:
6513400
Change-Id: Ib979f4b6ffe799ab56e66fc3acfad754d216c576
The Android Automerger [Fri, 8 Jun 2012 21:17:42 +0000 (14:17 -0700)]
JRN69C
The Android Automerger [Fri, 8 Jun 2012 18:41:12 +0000 (11:41 -0700)]
JRN69B
Eino-Ville Talvala [Fri, 8 Jun 2012 16:34:52 +0000 (09:34 -0700)]
am
e245ecdc: Merge "Add LegacyCamera to SDK product" into jb-dev
* commit '
e245ecdc0a87fb198894995ffbc4e6fec8d812f8':
Add LegacyCamera to SDK product
Eino-Ville Talvala [Fri, 8 Jun 2012 16:32:27 +0000 (09:32 -0700)]
Merge "Add LegacyCamera to SDK product" into jb-dev
Ying Wang [Fri, 8 Jun 2012 16:27:08 +0000 (09:27 -0700)]
am
79d39a30: am
874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"
* commit '
79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b':
Fix generic build on Max OS X 10.7 Lion
Ying Wang [Fri, 8 Jun 2012 16:24:19 +0000 (09:24 -0700)]
am
874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"
* commit '
874563f92e18d54d9088408104cc28d35971f189':
Fix generic build on Max OS X 10.7 Lion
Ying Wang [Fri, 8 Jun 2012 16:00:05 +0000 (09:00 -0700)]
Merge "Fix generic build on Max OS X 10.7 Lion"
The Android Automerger [Fri, 8 Jun 2012 15:27:09 +0000 (08:27 -0700)]
JRN69
The Android Automerger [Fri, 8 Jun 2012 15:15:37 +0000 (08:15 -0700)]
merge in jb-release history after reset to jb-dev
SangWook Han [Fri, 8 Jun 2012 05:55:05 +0000 (14:55 +0900)]
Fix generic build on Max OS X 10.7 Lion
Recover variable build_mac_version which is removed on
commit
644dc16 and added on commit
9ce06f1.
Without this, ranlib libSDL.a is executed on Lion which
causes build fail of emulator-arm.
Change-Id: I06144a288921f8f968ef457999398c1b9152d4aa
Keun young Park [Thu, 7 Jun 2012 23:31:14 +0000 (16:31 -0700)]
am
efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
* commit '
efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd':
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
The Android Automerger [Thu, 7 Jun 2012 22:55:50 +0000 (15:55 -0700)]
JRN68B
Keun young Park [Thu, 7 Jun 2012 00:19:29 +0000 (17:19 -0700)]
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media
Bug:
6623618
Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
Raphael Moll [Thu, 7 Jun 2012 20:08:58 +0000 (13:08 -0700)]
am
b53a073d: am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
b53a073ddb3a5036f41ea2956792991b7a46da02':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 20:06:23 +0000 (13:06 -0700)]
am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
e375c940b9210ea514227b0ee8cfb896d7f11d93':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 19:26:08 +0000 (12:26 -0700)]
Merge "SDK: Use "strip -x" for atree."
Ying Wang [Thu, 7 Jun 2012 19:02:06 +0000 (12:02 -0700)]
am
3da13457: am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
3da13457cfa46cf7d46b57c00f387c7c310b2dba':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 19:00:21 +0000 (12:00 -0700)]
am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
4b030617e74405779c657b98fa2b2e521adf4908':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 18:25:37 +0000 (11:25 -0700)]
Merge "XCode 4.3+ compatibility check-in"
Al Sutton [Thu, 7 Jun 2012 18:10:13 +0000 (19:10 +0100)]
XCode 4.3+ compatibility check-in
XCode 4.3 and later use a different location for SDKs. This check in
ensures the build checks for the new location as well as the old one.
Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241
Signed-off-by: Al Sutton <al@funkyandroid.com>
The Android Open Source Project [Thu, 7 Jun 2012 14:48:48 +0000 (07:48 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ifb66dc982a827827f324018084f0c6f191cb3769
The Android Automerger [Thu, 7 Jun 2012 14:09:17 +0000 (07:09 -0700)]
JRN68
The Android Automerger [Thu, 7 Jun 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Raphael Moll [Thu, 7 Jun 2012 02:33:31 +0000 (19:33 -0700)]
SDK: Use "strip -x" for atree.
Also fixes atree to accept an alternate command via the env var ATREE_STRIP
and correctly splits it for execvp if it contains arguments.
Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
The Android Automerger [Wed, 6 Jun 2012 23:50:19 +0000 (16:50 -0700)]
JRN67D
The Android Automerger [Wed, 6 Jun 2012 23:14:11 +0000 (16:14 -0700)]
JRN67C
Keun young Park [Wed, 6 Jun 2012 22:51:24 +0000 (15:51 -0700)]
am
6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '
6aae80a8d500084466c7e6d90769dda9a5b20507':
add mini.mk for common configurations for mini products
Keun young Park [Wed, 6 Jun 2012 22:47:24 +0000 (15:47 -0700)]
Merge "add mini.mk for common configurations for mini products" into jb-dev
Keun young Park [Mon, 4 Jun 2012 17:47:31 +0000 (10:47 -0700)]
add mini.mk for common configurations for mini products
- it is used for generic pdk release
Bug:
6540216
Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
Ying Wang [Wed, 6 Jun 2012 16:44:17 +0000 (09:44 -0700)]
am
6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev
* commit '
6afbda9f07821deed6eb110247ab56fb47dfc775':
Clean common intermediate files if overlay changed
Ying Wang [Wed, 6 Jun 2012 16:41:10 +0000 (09:41 -0700)]
Merge "Clean common intermediate files if overlay changed" into jb-dev
The Android Automerger [Wed, 6 Jun 2012 16:13:38 +0000 (09:13 -0700)]
JRN67B
The Android Automerger [Wed, 6 Jun 2012 14:08:29 +0000 (07:08 -0700)]
JRN67
The Android Automerger [Wed, 6 Jun 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 5 Jun 2012 23:25:02 +0000 (16:25 -0700)]
JRN66C
Raghu Gandham [Tue, 5 Jun 2012 22:33:37 +0000 (15:33 -0700)]
This patch addresses the following issues:
1. Fix a typo.
2. Include libffi in the MIPS list of Product Packages.
3. Default to JSC for MIPS until the MIPS support in v8 lands in aosp.
Ying Wang [Tue, 5 Jun 2012 22:25:39 +0000 (15:25 -0700)]
am
e534e2eb: am
47450542: Merge "Use Mac OS X SDK 10.6."
* commit '
e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
Use Mac OS X SDK 10.6.