Commit graph

8973 commits

Author SHA1 Message Date
The Android Automerger
1577b15dca merge in jb-release history after reset to jb-dev 2012-06-16 06:59:32 -07:00
The Android Automerger
175026a969 JRN75E 2012-06-15 16:17:07 -07:00
The Android Automerger
fe79d01cad JRN75D 2012-06-15 14:13:01 -07:00
The Android Automerger
ccfa22ebad JRN75C 2012-06-14 16:48:04 -07:00
The Android Automerger
43843b6f58 JRN75B 2012-06-14 13:29:21 -07:00
Jean-Baptiste Queru
74aba61404 Allow additional vendors
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
2012-06-14 09:15:20 -07:00
The Android Automerger
91f3d748c4 JRN75 2012-06-14 07:09:54 -07:00
The Android Automerger
11b1194cf6 merge in jb-release history after reset to jb-dev 2012-06-14 06:59:24 -07:00
The Android Automerger
291b58d00d JRN74C 2012-06-13 18:43:04 -07:00
The Android Automerger
0445111a01 JRN74B 2012-06-13 16:40:23 -07:00
The Android Automerger
d3acbf293f JRN74 2012-06-13 09:03:15 -07:00
The Android Automerger
e0db94ba82 merge in jb-release history after reset to jb-dev 2012-06-13 08:26:26 -07:00
The Android Automerger
11ee14dd10 JRN73 2012-06-12 11:30:36 -07:00
The Android Automerger
7acc0ed4a6 merge in jb-release history after reset to jb-dev 2012-06-12 11:19:13 -07:00
The Android Automerger
9657c6160d JRN72D 2012-06-12 08:22:39 -07:00
The Android Automerger
3b123c068d JRN72C 2012-06-11 17:17:03 -07:00
The Android Automerger
2715ac8e13 JRN72B 2012-06-11 13:24:52 -07:00
Jamie Gennis
f3b1395a41 Merge "Add atrace to core.mk" into jb-dev 2012-06-11 12:04:24 -07:00
The Android Automerger
fc57a28a65 JRN72 2012-06-11 07:09:29 -07:00
The Android Automerger
2367ea65d6 merge in jb-release history after reset to jb-dev 2012-06-11 06:59:30 -07:00
The Android Automerger
18cb32b10e JRN69D 2012-06-08 15:52:35 -07:00
Jamie Gennis
a9efae347f 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
2012-06-08 14:59:42 -07:00
The Android Automerger
13a099d47a JRN69C 2012-06-08 14:17:42 -07:00
The Android Automerger
7765a8af65 JRN69B 2012-06-08 11:41:12 -07:00
Eino-Ville Talvala
e245ecdc0a Merge "Add LegacyCamera to SDK product" into jb-dev 2012-06-08 09:32:27 -07:00
The Android Automerger
a63502c8e6 JRN69 2012-06-08 08:27:09 -07:00
The Android Automerger
e98b55d0f3 merge in jb-release history after reset to jb-dev 2012-06-08 08:15:37 -07:00
The Android Automerger
1f61e09727 JRN68B 2012-06-07 15:55:50 -07:00
Keun young Park
efe02ce9e0 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
2012-06-07 15:40:53 -07:00
The Android Automerger
adca40cfad JRN68 2012-06-07 07:09:17 -07:00
The Android Automerger
6c232a6026 merge in jb-release history after reset to jb-dev 2012-06-07 06:59:31 -07:00
The Android Automerger
04e7264029 JRN67D 2012-06-06 16:50:19 -07:00
The Android Automerger
099f4ae979 JRN67C 2012-06-06 16:14:11 -07:00
Keun young Park
6aae80a8d5 Merge "add mini.mk for common configurations for mini products" into jb-dev 2012-06-06 15:47:24 -07:00
Keun young Park
fd9f8bcfdb add mini.mk for common configurations for mini products
- it is used for generic pdk release

Bug: 6540216

Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
2012-06-06 14:15:57 -07:00
Ying Wang
6afbda9f07 Merge "Clean common intermediate files if overlay changed" into jb-dev 2012-06-06 09:41:10 -07:00
The Android Automerger
84f4b69813 JRN67B 2012-06-06 09:13:38 -07:00
The Android Automerger
989d99ab28 JRN67 2012-06-06 07:08:29 -07:00
The Android Automerger
9d6ab50c01 merge in jb-release history after reset to jb-dev 2012-06-06 06:59:23 -07:00
The Android Automerger
0296c83486 JRN66C 2012-06-05 16:25:02 -07:00
Eino-Ville Talvala
97150497b3 Add LegacyCamera to SDK product
Change-Id: I690bf0ba6435c520c3de1d6fb250ffae1ae45475
2012-06-05 13:53:33 -07:00
The Android Automerger
c5c3c70c6f JRN66B 2012-06-05 10:47:19 -07:00
Jean-Baptiste Queru
90beb4f155 Add some known binary owners
Bug: 6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
2012-06-05 08:08:06 -07:00
The Android Automerger
66b114dceb JRN66 2012-06-05 07:00:37 -07:00
The Android Automerger
de751ac25c merge in jb-release history after reset to jb-dev 2012-06-05 06:59:01 -07:00
Ying Wang
71004f8135 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
2012-06-04 18:02:55 -07:00
The Android Automerger
2c6cb07f43 JRN65B 2012-06-04 15:36:50 -07:00
The Android Automerger
a1fe1ab47e JRN65 2012-06-04 06:08:33 -07:00
The Android Automerger
2143ff00e6 merge in jb-release history after reset to jb-dev 2012-06-04 05:59:24 -07:00
The Android Automerger
81ae93ab2c JRN64 2012-06-03 06:12:07 -07:00