OSDN Git Service
The Android Automerger [Fri, 15 Jun 2012 21:13:01 +0000 (14:13 -0700)]
JRN75D
The Android Automerger [Thu, 14 Jun 2012 23:48:04 +0000 (16:48 -0700)]
JRN75C
The Android Automerger [Thu, 14 Jun 2012 20:29:21 +0000 (13:29 -0700)]
JRN75B
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
The Android Automerger [Wed, 13 Jun 2012 23:40:23 +0000 (16:40 -0700)]
JRN74B
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
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
The Android Automerger [Tue, 12 Jun 2012 00:17:03 +0000 (17:17 -0700)]
JRN72C
The Android Automerger [Mon, 11 Jun 2012 20:24:52 +0000 (13:24 -0700)]
JRN72B
Jamie Gennis [Mon, 11 Jun 2012 19:04:24 +0000 (12:04 -0700)]
Merge "Add atrace to core.mk" into jb-dev
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:32:27 +0000 (09:32 -0700)]
Merge "Add LegacyCamera to SDK product" into jb-dev
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
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
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
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: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: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
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: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:22:31 +0000 (09:22 -0700)]
Don't use .. to reference the target file.
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
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 [Thu, 31 May 2012 21:58:10 +0000 (14:58 -0700)]
JRN61B
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
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
Keun young Park [Wed, 30 May 2012 23:11:06 +0000 (16:11 -0700)]
Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
Keun young Park [Wed, 30 May 2012 17:22:29 +0000 (10:22 -0700)]
add add-to-product-copy-files-if-exists for pdk
Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
The Android Automerger [Wed, 30 May 2012 23:00:12 +0000 (16:00 -0700)]
JRN60B
Jeff Brown [Wed, 30 May 2012 20:52:22 +0000 (13:52 -0700)]
Make make make faster.
Optimize common case of uniq-words where the word is not
actually duplicated. Reduces make startup overhead.
Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
The Android Automerger [Wed, 30 May 2012 14:10:33 +0000 (07:10 -0700)]
JRN60
The Android Automerger [Wed, 30 May 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 30 May 2012 04:53:55 +0000 (21:53 -0700)]
JRN59D
The Android Automerger [Wed, 30 May 2012 02:48:47 +0000 (19:48 -0700)]
JRN59C
Keun young Park [Wed, 30 May 2012 00:55:46 +0000 (17:55 -0700)]
add platform.zip from platform-java to dist
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
The Android Automerger [Tue, 29 May 2012 22:50:42 +0000 (15:50 -0700)]
JRN59B
Ying Wang [Tue, 29 May 2012 20:42:18 +0000 (13:42 -0700)]
Fix typo.
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
The Android Automerger [Tue, 29 May 2012 16:05:39 +0000 (09:05 -0700)]
JRN59
The Android Automerger [Tue, 29 May 2012 15:54:56 +0000 (08:54 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 25 May 2012 22:31:30 +0000 (15:31 -0700)]
JRN54F
The Android Automerger [Fri, 25 May 2012 22:12:01 +0000 (15:12 -0700)]
JRN54E
Keun young Park [Fri, 25 May 2012 17:52:44 +0000 (10:52 -0700)]
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
The Android Automerger [Fri, 25 May 2012 19:21:49 +0000 (12:21 -0700)]
JRN54D
The Android Automerger [Fri, 25 May 2012 18:14:20 +0000 (11:14 -0700)]
JRN54C
The Android Automerger [Fri, 25 May 2012 05:41:54 +0000 (22:41 -0700)]
JRN54B
Keun young Park [Thu, 24 May 2012 19:53:07 +0000 (12:53 -0700)]
Merge "enable PDK to use platform JAVA API" into jb-dev
Keun young Park [Wed, 16 May 2012 17:32:41 +0000 (10:32 -0700)]
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
The Android Automerger [Thu, 24 May 2012 14:05:47 +0000 (07:05 -0700)]
JRN54
The Android Automerger [Thu, 24 May 2012 13:57:40 +0000 (06:57 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 24 May 2012 13:53:04 +0000 (06:53 -0700)]
JRN53E
The Android Automerger [Thu, 24 May 2012 06:18:26 +0000 (23:18 -0700)]
JRN53D
The Android Automerger [Thu, 24 May 2012 04:37:08 +0000 (21:37 -0700)]
JRN53C
The Android Automerger [Thu, 24 May 2012 00:37:06 +0000 (17:37 -0700)]
JRN53B
The Android Automerger [Wed, 23 May 2012 14:10:16 +0000 (07:10 -0700)]
JRN53
The Android Automerger [Wed, 23 May 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Wed, 23 May 2012 01:29:02 +0000 (18:29 -0700)]
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
The Android Automerger [Tue, 22 May 2012 19:31:22 +0000 (12:31 -0700)]
JRN52B
The Android Automerger [Tue, 22 May 2012 14:11:08 +0000 (07:11 -0700)]
JRN52
The Android Automerger [Tue, 22 May 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 22 May 2012 05:02:14 +0000 (22:02 -0700)]
JRN51C
The Android Automerger [Mon, 21 May 2012 19:52:03 +0000 (12:52 -0700)]
JRN51B
The Android Automerger [Mon, 21 May 2012 14:10:56 +0000 (07:10 -0700)]
JRN51
The Android Automerger [Mon, 21 May 2012 13:59:35 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 20 May 2012 14:40:09 +0000 (07:40 -0700)]
JRN50
The Android Automerger [Sun, 20 May 2012 14:39:35 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 19 May 2012 18:45:04 +0000 (11:45 -0700)]
JRN47E
The Android Automerger [Sat, 19 May 2012 18:42:50 +0000 (11:42 -0700)]
JRN49
The Android Automerger [Sat, 19 May 2012 17:53:39 +0000 (10:53 -0700)]
JRN47E
The Android Automerger [Fri, 18 May 2012 22:21:39 +0000 (15:21 -0700)]
JRN47D