OSDN Git Service
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.
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
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
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
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"
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
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:"
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.
Ying Wang [Tue, 5 Jun 2012 22:23:30 +0000 (15:23 -0700)]
am
47450542: Merge "Use Mac OS X SDK 10.6."
* commit '
47450542a3d07eb79c80035c701638b1f07eb1c0':
Use Mac OS X SDK 10.6.
Ying Wang [Tue, 5 Jun 2012 22:14:52 +0000 (15:14 -0700)]
Merge "Use Mac OS X SDK 10.6."
Ying Wang [Fri, 25 May 2012 22:14:12 +0000 (15:14 -0700)]
Use Mac OS X SDK 10.6.
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
Eino-Ville Talvala [Tue, 5 Jun 2012 20:53:33 +0000 (13:53 -0700)]
Add LegacyCamera to SDK product
Change-Id: I690bf0ba6435c520c3de1d6fb250ffae1ae45475
The Android Automerger [Tue, 5 Jun 2012 17:47:19 +0000 (10:47 -0700)]
JRN66B
Jean-Baptiste Queru [Tue, 5 Jun 2012 15:23:19 +0000 (08:23 -0700)]
am
90beb4f1: Add some known binary owners
* commit '
90beb4f155f9e0a7508854ded5b2c3dd87d702f5':
Add some known binary owners
Jean-Baptiste Queru [Tue, 5 Jun 2012 15:08:03 +0000 (08:08 -0700)]
Add some known binary owners
Bug:
6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
The Android Automerger [Tue, 5 Jun 2012 14:00:37 +0000 (07:00 -0700)]
JRN66
The Android Automerger [Tue, 5 Jun 2012 13:59:01 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Fri, 25 May 2012 04:05:19 +0000 (21:05 -0700)]
Clean common intermediate files if overlay changed
This change cleans the packages' intermediate files if their overlays
changed between incremental builds.
If two builds have different overlay, they will have different R
classes, and so the jar files in the common intermediate dirs can
not be shared. Therefore incremental build can't be applied.
This change detects the overlay changes on package's base.
If a package's overlay is different from the previous build, its common
intermediate dir is nuked.
This makes broader incremental builds possible.
Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
The Android Automerger [Mon, 4 Jun 2012 22:36:50 +0000 (15:36 -0700)]
JRN65B
The Android Automerger [Mon, 4 Jun 2012 13:08:33 +0000 (06:08 -0700)]
JRN65
The Android Automerger [Mon, 4 Jun 2012 12:59:24 +0000 (05:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 3 Jun 2012 13:12:07 +0000 (06:12 -0700)]
JRN64
The Android Automerger [Sun, 3 Jun 2012 12:59:39 +0000 (05:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 2 Jun 2012 16:26:47 +0000 (09:26 -0700)]
am
28a18175: Don\'t use .. to reference the target file.
* commit '
28a181759079c34f8776f98f553e56554b527069':
Don't use .. to reference the target file.
Ying Wang [Sat, 2 Jun 2012 16:22:31 +0000 (09:22 -0700)]
Don't use .. to reference the target file.
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
Jean-Baptiste Queru [Sat, 2 Jun 2012 15:35:03 +0000 (08:35 -0700)]
am
e7af5e24: Add Live Wallpapers to AOSP builds
* commit '
e7af5e2428d6c831acb73fac6547c3a780dca729':
Add Live Wallpapers to AOSP builds
Jean-Baptiste Queru [Sat, 2 Jun 2012 01:27:03 +0000 (18:27 -0700)]
Add Live Wallpapers to AOSP builds
Change-Id: I76df14d99fd876b765510ced8f5523e3bafce291
The Android Automerger [Fri, 1 Jun 2012 23:19:57 +0000 (16:19 -0700)]
JFN53N take two
The Android Automerger [Fri, 1 Jun 2012 22:10:10 +0000 (15:10 -0700)]
JFN53N
The Android Automerger [Thu, 31 May 2012 22:54:45 +0000 (15:54 -0700)]
JFN53M
The Android Automerger [Thu, 31 May 2012 21:58:10 +0000 (14:58 -0700)]
JRN61B
Wink Saville [Thu, 31 May 2012 20:25:41 +0000 (13:25 -0700)]
am
f97105ea: Merge "Fix rild running in Nakasi." into jb-dev
* commit '
f97105ea898fd4ad83ca55e391c0d512e3497b9b':
Fix rild running in Nakasi.
Wink Saville [Thu, 31 May 2012 20:21:34 +0000 (13:21 -0700)]
Merge "Fix rild running in Nakasi." into jb-dev
Wink Saville [Thu, 31 May 2012 17:35:52 +0000 (10:35 -0700)]
Fix rild running in Nakasi.
The module rild is telephony specific, since Nakasi has no radio
it shouldn't run rild. Changing the build system so rild is optional
for products that don't have telephony support.
Since rild is now optional, it is necessary to add it explicitly to
the sdk build as the sdk build is special.
Bug:
6463864
Change-Id: If944e051023b567807585fb91163a1e3f79c1024
The Android Automerger [Thu, 31 May 2012 14:10:16 +0000 (07:10 -0700)]
JRN61
The Android Automerger [Thu, 31 May 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 31 May 2012 07:43:17 +0000 (00:43 -0700)]
JFN53L
The Android Automerger [Thu, 31 May 2012 07:11:46 +0000 (00:11 -0700)]
JFN53K
Keun young Park [Thu, 31 May 2012 03:34:00 +0000 (20:34 -0700)]
am
15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '
15d151367482b6ed47cecf1a578b365b7c6ccab3':
change location of apns-conf.xml and vold.conf
Keun young Park [Thu, 31 May 2012 03:30:29 +0000 (20:30 -0700)]
Merge "change location of apns-conf.xml and vold.conf" into jb-dev
Keun young Park [Wed, 30 May 2012 23:32:30 +0000 (16:32 -0700)]
change location of apns-conf.xml and vold.conf
- from development/data to device/generic/goldfish/data
Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9