OSDN Git Service
The Android Open Source Project [Fri, 22 Jun 2012 15:18:23 +0000 (08:18 -0700)]
am
fa90185a: Reconcile with jb-release
* commit '
fa90185a339f6b55897d529c62cc4a541ccb7d6f':
JRN82C
JRN82B
JRN82
JRN81C
JRN81B
The Android Open Source Project [Fri, 22 Jun 2012 15:16:45 +0000 (08:16 -0700)]
Reconcile with jb-release
Change-Id: I75d44aea2008be774afc674fda49c2220583080d
Scott Main [Fri, 22 Jun 2012 04:35:28 +0000 (21:35 -0700)]
am
d86c00b6: am
e4d8f1b1: Massive clobber of all template files in developer site for new design
* commit '
d86c00b66666b700afac0b2396e2d81e583bd0ef':
Massive clobber of all template files in developer site for new design
Scott Main [Fri, 22 Jun 2012 04:32:44 +0000 (21:32 -0700)]
am
e4d8f1b1: Massive clobber of all template files in developer site for new design
* commit '
e4d8f1b1f5a6e2308bfeff04d7fa51ff7394c644':
Massive clobber of all template files in developer site for new design
Scott Main [Fri, 22 Jun 2012 01:03:05 +0000 (18:03 -0700)]
Massive clobber of all template files in developer site for new design
Change-Id: I5f243dcb377a8b2e573c404a9e685cc64e0e06d2
The Android Automerger [Fri, 22 Jun 2012 00:58:04 +0000 (17:58 -0700)]
JRN82C
The Android Automerger [Fri, 22 Jun 2012 00:47:30 +0000 (17:47 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 21:27:43 +0000 (14:27 -0700)]
JRN82B
The Android Automerger [Thu, 21 Jun 2012 21:16:15 +0000 (14:16 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 14:09:05 +0000 (07:09 -0700)]
JRN82
The Android Automerger [Thu, 21 Jun 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 21 Jun 2012 01:27:28 +0000 (18:27 -0700)]
JRN81C
The Android Automerger [Wed, 20 Jun 2012 22:46:52 +0000 (15:46 -0700)]
JRN81B
Keun young Park [Wed, 20 Jun 2012 16:47:12 +0000 (09:47 -0700)]
Merge "replace development/data/etc/ to device/generic/goldfish/data/etc"
The Android Open Source Project [Wed, 20 Jun 2012 15:28:16 +0000 (08:28 -0700)]
am
da21229d: Reconcile with jb-release
* commit '
da21229d7b5ff4993a1efbe603e2e971da96e6b4':
JRN81
JRN80C
JRN80B
The Android Open Source Project [Wed, 20 Jun 2012 15:25:33 +0000 (08:25 -0700)]
Reconcile with jb-release
Change-Id: I71f037e68eda652f71ce7a15e4afff031adbd913
The Android Automerger [Wed, 20 Jun 2012 14:09:13 +0000 (07:09 -0700)]
JRN81
The Android Automerger [Wed, 20 Jun 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Keun young Park [Wed, 20 Jun 2012 01:02:22 +0000 (18:02 -0700)]
replace development/data/etc/ to device/generic/goldfish/data/etc
- Files under development/data/etc will be removed
Change-Id: I39907cda9b3253f1608ed3231a8a9945087348d7
The Android Automerger [Tue, 19 Jun 2012 23:30:09 +0000 (16:30 -0700)]
JRN80C
Ying Wang [Tue, 19 Jun 2012 21:33:09 +0000 (14:33 -0700)]
resolved conflicts for merge of
9b76c054 to master
Change-Id: I4190ef6895b7ddb27d9a293cbacecdef1f4f20b8
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
The Android Automerger [Tue, 19 Jun 2012 19:49:07 +0000 (12:49 -0700)]
JRN80B
Jean-Baptiste Queru [Tue, 19 Jun 2012 18:29:28 +0000 (11:29 -0700)]
am
a644e7bb: am
03bb0851: Remove references to packages that don\'t exist any more.
* commit '
a644e7bb66ab590a8758f89febe228f2f8987b32':
Remove references to packages that don't exist any more.
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
Ying Wang [Tue, 19 Jun 2012 16:23:38 +0000 (09:23 -0700)]
Merge "lint support."
The Android Open Source Project [Tue, 19 Jun 2012 14:17:50 +0000 (07:17 -0700)]
am
ef3a5321: Reconcile with jb-release
* commit '
ef3a532141e02d529dd5c61716c2fd4654ddc025':
JRN80
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:15:53 +0000 (06:15 -0700)]
am
e8d1719b: Reconcile with jb-release
* commit '
e8d1719bd2f4acb51027d1da455acd1f54d3ecf7':
JRN79C
JRN79B
JRN79
JRN78B
JRN78
JRN77
JRN75E
JRN75D
JRN75C
JRN75B
JRN75
JRN74C
JRN74B
JRN74
JRN73
JRN72D
JRN72C
JRN72B
The Android Open Source Project [Tue, 19 Jun 2012 13:13:10 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: I7cea6b7dd25e75e4b0a738cfa890fcaa556c2d0b
Ying Wang [Tue, 19 Jun 2012 01:45:40 +0000 (18:45 -0700)]
lint support.
Bug:
6167394
$make lint-<app-name> # to lint on a single module
$make lintall # to lint on all packages in the source
tree.
Change-Id: I4decc76fb75793ce44809232b0ec72b766fbb434
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
Ying Wang [Mon, 18 Jun 2012 22:29:15 +0000 (15:29 -0700)]
Merge "Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build""
Ying Wang [Mon, 18 Jun 2012 22:29:10 +0000 (15:29 -0700)]
Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"
This reverts commit
81f0fd6cdbf42d1034bf9e9f36991a131eca3f4f
The change broke the CTS build:
CTS does need the jni library embedded in the apk.
Keun young Park [Mon, 18 Jun 2012 19:46:46 +0000 (12:46 -0700)]
clean up pdk_config.mk
- define ...JAVA_ZIP_... variables only when necessary
- fix missed case for TARGET_BUILD_JAVA_SUPPORT_LEVEL definition
Change-Id: I4f491ff212fd1e973a77499bbf3fd8d1940bb1f8
Guang Zhu [Mon, 18 Jun 2012 18:57:55 +0000 (11:57 -0700)]
am
d214c7e4: am
5d76a3f2: Merge "add uiautomator into system image" into jb-dev
* commit '
d214c7e495f10f87d2834a3137c8c29512f7cfc5':
add uiautomator into system image
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:52:19 +0000 (10:52 -0700)]
am
51125621: am
43ca4a45: Remove the user tag and legacy prebuilts for the srec modules.
* commit '
51125621080c64b106abaeb414676cf51c0fd9c3':
Remove the user tag and legacy prebuilts for the srec modules.
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
Torne (Richard Coles) [Mon, 18 Jun 2012 08:51:46 +0000 (01:51 -0700)]
Merge "Make building an empty static library work."
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
Ying Wang [Sat, 16 Jun 2012 00:36:50 +0000 (17:36 -0700)]
Merge "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"
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
Torne (Richard Coles) [Fri, 15 Jun 2012 15:03:52 +0000 (16:03 +0100)]
Make building an empty static library work.
Handle the case where a static library is not built because it has no
input files (e.g. because they are conditionally included and it happens
that the computed list is empty). Previously, ar never ran because of
split-long-arguments, and anything that depended on the static library
would fail to link. Make sure that ar runs at least once.
Change-Id: If0071d7ae50c4e45fff1772dca43187af155db1f
The Android Automerger [Thu, 14 Jun 2012 23:48:04 +0000 (16:48 -0700)]
JRN75C
Ying Wang [Thu, 14 Jun 2012 22:29:20 +0000 (15:29 -0700)]
Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build
To save space.
Change-Id: I7c88c13e4225bed89106917de57cbae74fc79ab8
The Android Automerger [Thu, 14 Jun 2012 20:29:21 +0000 (13:29 -0700)]
JRN75B
Jean-Baptiste Queru [Thu, 14 Jun 2012 17:34:46 +0000 (10:34 -0700)]
am
ffbef646: am
74aba614: Allow additional vendors
* commit '
ffbef646d2bec4f84874bdc5940c3b060904cb3d':
Allow additional vendors
Jean-Baptiste Queru [Thu, 14 Jun 2012 17:33:20 +0000 (10:33 -0700)]
am
55e8c113: am
3e4732a3: am
08779651: Merge "generic_x86: build using the NDK ABI\'s processor features"
* commit '
55e8c113afc9d52d2142de72a4eebfc2c5a9ef05':
generic_x86: build using the NDK ABI's processor features
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
Ying Wang [Wed, 13 Jun 2012 18:38:10 +0000 (11:38 -0700)]
Fix arm mode for the generated protobuf code.
Change-Id: Ic644ab9e1b83d9616dd9ca93362805cdd17f36a7
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:44:31 +0000 (07:44 -0700)]
am
6e207824: resolved conflicts for merge of
572d0d7d to jb-dev-plus-aosp
* commit '
6e207824af267eea8777949ccf6d0584accd55a0':
x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
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:56:29 +0000 (15:56 -0700)]
am
06b1a47f: am
d3d78a30: am
a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
* commit '
06b1a47fe19699e8cb94fd6a007f82f3b41119fe':
gcc 4.6 requires --copy-dt-needed-entries
Ying Wang [Tue, 12 Jun 2012 22:52:58 +0000 (15:52 -0700)]
Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK.
Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f
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
Stephen Hines [Tue, 12 Jun 2012 22:38:21 +0000 (15:38 -0700)]
Merge "EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds."
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 22:16:28 +0000 (15:16 -0700)]
am
12d24b5a: resolved conflicts for merge of
76af0657 to jb-dev-plus-aosp
* commit '
12d24b5aaba0752239401fc2c8b579e3b8ae97dd':
full_x86: use telephony profile
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
Stephen Hines [Mon, 11 Jun 2012 21:53:34 +0000 (14:53 -0700)]
EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds.
Change-Id: I463217aef573a28069469514ad94cd85a7f38bea
Jamie Gennis [Tue, 12 Jun 2012 20:14:45 +0000 (13:14 -0700)]
am
82c11cac: am
f3b1395a: Merge "Add atrace to core.mk" into jb-dev
* commit '
82c11caca04bc4e14e0a33057f484635dc1ae8dc':
Add atrace to core.mk
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:07:50 +0000 (08:07 -0700)]
am
ddb70678: am
5b7633be: am
06e515dd: Merge "This patch addresses the following issues:"
* commit '
ddb706785bd96fe7b450779ab41d1276939ee9fa':
This patch addresses the following issues:
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: