OSDN Git Service
Raphael Moll [Thu, 7 Jun 2012 20:08:58 +0000 (13:08 -0700)]
am
b53a073d: am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
b53a073ddb3a5036f41ea2956792991b7a46da02':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 20:06:23 +0000 (13:06 -0700)]
am
e375c940: Merge "SDK: Use "strip -x" for atree."
* commit '
e375c940b9210ea514227b0ee8cfb896d7f11d93':
SDK: Use "strip -x" for atree.
Raphael Moll [Thu, 7 Jun 2012 19:26:08 +0000 (12:26 -0700)]
Merge "SDK: Use "strip -x" for atree."
Ying Wang [Thu, 7 Jun 2012 19:02:06 +0000 (12:02 -0700)]
am
3da13457: am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
3da13457cfa46cf7d46b57c00f387c7c310b2dba':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 19:00:21 +0000 (12:00 -0700)]
am
4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '
4b030617e74405779c657b98fa2b2e521adf4908':
XCode 4.3+ compatibility check-in
Ying Wang [Thu, 7 Jun 2012 18:25:37 +0000 (11:25 -0700)]
Merge "XCode 4.3+ compatibility check-in"
Al Sutton [Thu, 7 Jun 2012 18:10:13 +0000 (19:10 +0100)]
XCode 4.3+ compatibility check-in
XCode 4.3 and later use a different location for SDKs. This check in
ensures the build checks for the new location as well as the old one.
Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241
Signed-off-by: Al Sutton <al@funkyandroid.com>
The Android Open Source Project [Thu, 7 Jun 2012 14:48:48 +0000 (07:48 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ifb66dc982a827827f324018084f0c6f191cb3769
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
Raphael Moll [Thu, 7 Jun 2012 02:33:31 +0000 (19:33 -0700)]
SDK: Use "strip -x" for atree.
Also fixes atree to accept an alternate command via the env var ATREE_STRIP
and correctly splits it for execvp if it contains arguments.
Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
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:51:24 +0000 (15:51 -0700)]
am
6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '
6aae80a8d500084466c7e6d90769dda9a5b20507':
add mini.mk for common configurations for mini products
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:44:17 +0000 (09:44 -0700)]
am
6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev
* commit '
6afbda9f07821deed6eb110247ab56fb47dfc775':
Clean common intermediate files if overlay changed
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
Ying Wang [Tue, 5 Jun 2012 22:25:39 +0000 (15:25 -0700)]
am
e534e2eb: am
47450542: Merge "Use Mac OS X SDK 10.6."
* commit '
e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
Use Mac OS X SDK 10.6.
Ying Wang [Tue, 5 Jun 2012 22:23:30 +0000 (15:23 -0700)]
am
47450542: Merge "Use Mac OS X SDK 10.6."
* commit '
47450542a3d07eb79c80035c701638b1f07eb1c0':
Use Mac OS X SDK 10.6.
Ying Wang [Tue, 5 Jun 2012 22:14:52 +0000 (15:14 -0700)]
Merge "Use Mac OS X SDK 10.6."
Ying Wang [Fri, 25 May 2012 22:14:12 +0000 (15:14 -0700)]
Use Mac OS X SDK 10.6.
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
The Android Automerger [Tue, 5 Jun 2012 17:47:19 +0000 (10:47 -0700)]
JRN66B
Jean-Baptiste Queru [Tue, 5 Jun 2012 15:23:19 +0000 (08:23 -0700)]
am
90beb4f1: Add some known binary owners
* commit '
90beb4f155f9e0a7508854ded5b2c3dd87d702f5':
Add some known binary owners
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:26:47 +0000 (09:26 -0700)]
am
28a18175: Don\'t use .. to reference the target file.
* commit '
28a181759079c34f8776f98f553e56554b527069':
Don't use .. to reference the target file.
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 15:35:03 +0000 (08:35 -0700)]
am
e7af5e24: Add Live Wallpapers to AOSP builds
* commit '
e7af5e2428d6c831acb73fac6547c3a780dca729':
Add Live Wallpapers to AOSP builds
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 [Fri, 1 Jun 2012 23:19:57 +0000 (16:19 -0700)]
JFN53N take two
The Android Automerger [Fri, 1 Jun 2012 22:10:10 +0000 (15:10 -0700)]
JFN53N
The Android Automerger [Thu, 31 May 2012 22:54:45 +0000 (15:54 -0700)]
JFN53M
The Android Automerger [Thu, 31 May 2012 21:58:10 +0000 (14:58 -0700)]
JRN61B
Wink Saville [Thu, 31 May 2012 20:25:41 +0000 (13:25 -0700)]
am
f97105ea: Merge "Fix rild running in Nakasi." into jb-dev
* commit '
f97105ea898fd4ad83ca55e391c0d512e3497b9b':
Fix rild running in Nakasi.
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
The Android Automerger [Thu, 31 May 2012 07:43:17 +0000 (00:43 -0700)]
JFN53L
The Android Automerger [Thu, 31 May 2012 07:11:46 +0000 (00:11 -0700)]
JFN53K
Keun young Park [Thu, 31 May 2012 03:34:00 +0000 (20:34 -0700)]
am
15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '
15d151367482b6ed47cecf1a578b365b7c6ccab3':
change location of apns-conf.xml and vold.conf
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:13:43 +0000 (16:13 -0700)]
am
36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
* commit '
36e4e050ff52956fc4afe60c156e81c2016304c4':
add add-to-product-copy-files-if-exists for pdk
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 22:02:56 +0000 (15:02 -0700)]
am
01efddb0: Make make make faster.
* commit '
01efddb0b8c641a9ebfd955173dd58e015fbe903':
Make make make faster.
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 Open Source Project [Wed, 30 May 2012 17:12:45 +0000 (10:12 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Iaa4109b5db2d6b15e214c05554b586e5604d9692
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
The Android Automerger [Wed, 30 May 2012 02:45:42 +0000 (19:45 -0700)]
JFN53J
Keun young Park [Wed, 30 May 2012 01:28:00 +0000 (18:28 -0700)]
am
3e93aeae: add platform.zip from platform-java to dist
* commit '
3e93aeae10aa70ab64e78fbab0bb8741d0b04d99':
add platform.zip from platform-java to dist
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:44:13 +0000 (13:44 -0700)]
Ying Wang [Tue, 29 May 2012 20:42:18 +0000 (13:42 -0700)]
Fix typo.
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
The Android Open Source Project [Tue, 29 May 2012 16:39:20 +0000 (09:39 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I804144e79bf82b1d6d1f9e6dc9073249aad597f0
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
The Android Automerger [Fri, 25 May 2012 22:02:41 +0000 (15:02 -0700)]
JFN53I
Keun young Park [Fri, 25 May 2012 21:04:35 +0000 (14:04 -0700)]
am
d8de82fb: ignore touch error happening from broken symbolic link
* commit '
d8de82fbca4371ccefb41e02ac737e3a153901b3':
ignore touch error happening from broken symbolic link
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:25:04 +0000 (11:25 -0700)]
JFN53H
The Android Automerger [Fri, 25 May 2012 18:14:20 +0000 (11:14 -0700)]
JRN54C
Jean-Baptiste Queru [Fri, 25 May 2012 14:19:55 +0000 (07:19 -0700)]
am
a2bfde63: am
fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
* commit '
a2bfde63b767378979145cb8be55d9a305e2b4f5':
dalvik heapsize: Remove obsolete flag, set porperty
Jean-Baptiste Queru [Fri, 25 May 2012 14:16:04 +0000 (07:16 -0700)]
resolved conflicts for merge of
9f312b81 to jb-dev-plus-aosp
Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98
The Android Automerger [Fri, 25 May 2012 06:04:31 +0000 (23:04 -0700)]
JFN53G
The Android Automerger [Fri, 25 May 2012 05:41:54 +0000 (22:41 -0700)]
JRN54B
The Android Automerger [Thu, 24 May 2012 23:54:23 +0000 (16:54 -0700)]
JFN53F
Jean-Baptiste Queru [Thu, 24 May 2012 21:27:52 +0000 (14:27 -0700)]
am
fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
* commit '
fed2587c164d27de79ca7900e920a15cbf62f990':
dalvik heapsize: Remove obsolete flag, set porperty
Jean-Baptiste Queru [Thu, 24 May 2012 21:27:51 +0000 (14:27 -0700)]
am
3deea32a: Merge "Enable DRM support in the SDK system image"
* commit '
3deea32a31e16d92d1d632b5a1bd260416f6e7d5':
Enable DRM support in the SDK system image
Keun young Park [Thu, 24 May 2012 19:54:57 +0000 (12:54 -0700)]
am
ac440901: Merge "enable PDK to use platform JAVA API" into jb-dev
* commit '
ac44090133e4e3a674be831d28d6d8cc661d2472':
enable PDK to use platform JAVA API
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
Jean-Baptiste Queru [Thu, 24 May 2012 19:38:33 +0000 (12:38 -0700)]
Merge "dalvik heapsize: Remove obsolete flag, set porperty"
Bruce Beare [Thu, 24 May 2012 18:38:01 +0000 (11:38 -0700)]
dalvik heapsize: Remove obsolete flag, set porperty
Change-Id: I51360867171aaebce071b3391678ff6e7f191dc5
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
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 17:23:17 +0000 (10:23 -0700)]
JFN53E
The Android Automerger [Thu, 24 May 2012 17:15:38 +0000 (10:15 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
Jean-Baptiste Queru [Thu, 24 May 2012 17:14:05 +0000 (10:14 -0700)]
Merge "Enable DRM support in the SDK system image"
The Android Open Source Project [Thu, 24 May 2012 16:00:57 +0000 (09:00 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ib33447b73ea4b57a4eafa201c74879ecd31ae1a8
The Android Automerger [Thu, 24 May 2012 14:05:47 +0000 (07:05 -0700)]
JRN54