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
Keun young Park
ac44090133
Merge "enable PDK to use platform JAVA API" into jb-dev
2012-05-24 12:53:07 -07:00
Keun young Park
816b9fd4e2
enable PDK to use platform JAVA API
...
- make platform-java will add necessary Java stuffs from out/target/common/
to platform.zip
- make platform works as before: no Java libraries
- normal fusion build will pick up the file, and define TARGET_BUILD_PDK_JAVA
besides TARGET_BUILD_PDK if Java stuffs are included
- For TARGET_BUILD_PDK_JAVA, java.mk does not touch LOCAL_SDK_VERSION, which will lead into
pulling non-SDK Java APIs
Bug: 6482799
Change-Id: I90b1a0b06dc774150711680a6612f2b97b9eab3f
2012-05-24 11:19:31 -07:00
The Android Automerger
ea1d824378
JRN54
2012-05-24 07:05:47 -07:00
The Android Automerger
ce19307214
merge in jb-release history after reset to jb-dev
2012-05-24 06:57:40 -07:00
The Android Automerger
8e3b307726
JRN53E
2012-05-24 06:53:04 -07:00
The Android Automerger
7eb505123c
JRN53D
2012-05-23 23:18:26 -07:00
The Android Automerger
8ad9c19d72
JRN53C
2012-05-23 21:37:08 -07:00
The Android Automerger
1bdbe64ad6
JRN53B
2012-05-23 17:37:06 -07:00
The Android Automerger
3fbe1e2088
JRN53
2012-05-23 07:10:16 -07:00
The Android Automerger
c1e0abf194
merge in jb-release history after reset to jb-dev
2012-05-23 06:59:23 -07:00
Ying Wang
9ccacd7a6f
Set PWD to the absolute path of the top tree.
...
Previously PWD is passed in as a shell environmental variable,
which does not point to top of the source tree if you run mm/mmm.
That in turn breaks mm/mmm if OUT_DIR_COMMON_BASE is set to an absolute
path.
Change-Id: Iac99d5668aee1bbd3cb9897750afc2149bd9f973
2012-05-22 18:29:02 -07:00
The Android Automerger
cbd9e14eef
JRN52B
2012-05-22 12:31:22 -07:00
The Android Automerger
4689e01393
JRN52
2012-05-22 07:11:08 -07:00
The Android Automerger
bbdc981a08
merge in jb-release history after reset to jb-dev
2012-05-22 06:59:23 -07:00
The Android Automerger
f39a761217
JRN51C
2012-05-21 22:02:14 -07:00
The Android Automerger
166a1135d4
JRN51B
2012-05-21 12:52:03 -07:00
The Android Automerger
1a59d4cd72
JRN51
2012-05-21 07:10:56 -07:00
The Android Automerger
ef77de23f3
merge in jb-release history after reset to jb-dev
2012-05-21 06:59:35 -07:00
The Android Automerger
3838dbadeb
JRN50
2012-05-20 07:40:09 -07:00
The Android Automerger
d9eb4fd465
merge in jb-release history after reset to jb-dev
2012-05-20 07:39:35 -07:00