Commit graph

8944 commits

Author SHA1 Message Date
The Android Automerger
1f61e09727 JRN68B 2012-06-07 15:55:50 -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
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
The Android Automerger
8bb6d8eb44 merge in jb-release history after reset to jb-dev 2012-06-03 05:59:39 -07:00
Ying Wang
28a1817590 Don't use .. to reference the target file.
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
2012-06-02 09:22:31 -07:00
Jean-Baptiste Queru
e7af5e2428 Add Live Wallpapers to AOSP builds
Change-Id: I76df14d99fd876b765510ced8f5523e3bafce291
2012-06-01 18:27:03 -07:00
The Android Automerger
1fb843b723 JRN61B 2012-05-31 14:58:10 -07:00
Wink Saville
f97105ea89 Merge "Fix rild running in Nakasi." into jb-dev 2012-05-31 13:21:34 -07:00
Wink Saville
689f117b63 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
2012-05-31 10:35:52 -07:00
The Android Automerger
1544817a1d JRN61 2012-05-31 07:10:16 -07:00
The Android Automerger
eb46ce3fe7 merge in jb-release history after reset to jb-dev 2012-05-31 06:59:29 -07:00
Keun young Park
15d1513674 Merge "change location of apns-conf.xml and vold.conf" into jb-dev 2012-05-30 20:30:29 -07:00
Keun young Park
e581d866fb change location of apns-conf.xml and vold.conf
- from development/data to device/generic/goldfish/data

Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
2012-05-30 16:32:30 -07:00
Keun young Park
36e4e050ff Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev 2012-05-30 16:11:06 -07:00
Keun young Park
c41c5f4e46 add add-to-product-copy-files-if-exists for pdk
Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
2012-05-30 16:03:24 -07:00
The Android Automerger
23398c8571 JRN60B 2012-05-30 16:00:12 -07:00
Jeff Brown
01efddb0b8 Make make make faster.
Optimize common case of uniq-words where the word is not
actually duplicated.  Reduces make startup overhead.

Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
2012-05-30 13:52:22 -07:00
The Android Automerger
1347ee6aff JRN60 2012-05-30 07:10:33 -07:00
The Android Automerger
935f4ed555 merge in jb-release history after reset to jb-dev 2012-05-30 06:59:32 -07:00
The Android Automerger
70efb21cce JRN59D 2012-05-29 21:53:55 -07:00
The Android Automerger
0dcdc13763 JRN59C 2012-05-29 19:48:47 -07:00
Keun young Park
3e93aeae10 add platform.zip from platform-java to dist
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
2012-05-29 18:13:39 -07:00
The Android Automerger
d9a65fd160 JRN59B 2012-05-29 15:50:42 -07:00
Ying Wang
82eb7082aa Fix typo.
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
2012-05-29 13:42:18 -07:00
The Android Automerger
2e05f1ddf5 JRN59 2012-05-29 09:05:39 -07:00
The Android Automerger
a437192620 merge in jb-release history after reset to jb-dev 2012-05-29 08:54:56 -07:00
The Android Automerger
f26c49d1c9 JRN54F 2012-05-25 15:31:30 -07:00
The Android Automerger
117bfe3695 JRN54E 2012-05-25 15:12:01 -07:00
Keun young Park
d8de82fbca ignore touch error happening from broken symbolic link
- maguro platform.zip contains hdcp.keys symbolic link which is broken except env with the key
- this causes error in the touch

Bug: 6555557
Change-Id: I5f9ff5d57c87c0d3038545eeba3b553445a8493c
2012-05-25 12:22:22 -07:00
The Android Automerger
98d83b518e JRN54D 2012-05-25 12:21:49 -07:00
The Android Automerger
fc3b84a19a JRN54C 2012-05-25 11:14:20 -07:00
The Android Automerger
567b3e41c4 JRN54B 2012-05-24 22:41:54 -07:00