OSDN Git Service
Keun young Park [Thu, 31 May 2012 03:36:08 +0000 (20:36 -0700)]
am
53ba6b22: am
15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '
53ba6b22f94c1192541b11ada001b68823b97efa':
change location of apns-conf.xml and vold.conf
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:16:20 +0000 (16:16 -0700)]
am
dd8fe390: am
36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
* commit '
dd8fe390ae9244398b41d23adfb42dbaa9804599':
add add-to-product-copy-files-if-exists for pdk
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
Jeff Brown [Wed, 30 May 2012 22:05:48 +0000 (15:05 -0700)]
am
0e18fc47: am
01efddb0: Make make make faster.
* commit '
0e18fc47b6181df7d354860095453475c7ecfca0':
Make make make faster.
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:14:35 +0000 (10:14 -0700)]
am
2e0f19a3: Reconcile with jb-release nakasi-factoryrom-release
* commit '
2e0f19a3fb0de035028717941044ec9e6a36c4a4':
JRN60
JRN59D
JRN59C
JFN53J
JRN59B
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:32:33 +0000 (18:32 -0700)]
am
2e64f64c: am
3e93aeae: add platform.zip from platform-java to dist
* commit '
2e64f64c9bc1cc8cbf0f59723b78a278dec66b3b':
add platform.zip from platform-java to dist
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:47:00 +0000 (13:47 -0700)]
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:41:41 +0000 (09:41 -0700)]
am
679b1c03: Reconcile with jb-release nakasi-factoryrom-release
* commit '
679b1c031f144e64cb95797776955674563bc3de':
JRN59
JRN54F
JRN54E
JFN53I
JRN54D
JFN53H
JRN54C
JFN53G
JRN54B
JFN53F
JFN53E
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
Ying Wang [Sat, 26 May 2012 01:55:52 +0000 (18:55 -0700)]
Revert "Use Mac OS X SDK 10.6."
This reverts commit
4c1b310b9bdbebef83d298d305beb0122a7204f6
Ying Wang [Fri, 25 May 2012 22:14:12 +0000 (15:14 -0700)]
Use Mac OS X SDK 10.6.
Change-Id: Ie36914ab1763c5606111f7501c97ed97517e7187
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:07:47 +0000 (14:07 -0700)]
am
f89cd668: am
d8de82fb: ignore touch error happening from broken symbolic link
* commit '
f89cd6689c6d39303e61dca88d0f84f8c8fea662':
ignore touch error happening from broken symbolic link
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:35:55 +0000 (07:35 -0700)]
am
fe5d7c78: am
a2bfde63: am
fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
* commit '
fe5d7c788bc823f422f89c518949de5cbd77e996':
dalvik heapsize: Remove obsolete flag, set porperty
Jean-Baptiste Queru [Fri, 25 May 2012 14:35:53 +0000 (07:35 -0700)]
am
4261ace0: resolved conflicts for merge of
9f312b81 to jb-dev-plus-aosp
* commit '
4261ace0139d7bb864d002d7a65be66945ec8878':
Enable DRM support in the SDK system image
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
Elliott Hughes [Thu, 24 May 2012 22:21:44 +0000 (15:21 -0700)]
Merge "Compile Mac OS binaries with unwind tables for libcorkscrew."
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:57:07 +0000 (12:57 -0700)]
am
2b9a7982: am
ac440901: Merge "enable PDK to use platform JAVA API" into jb-dev
* commit '
2b9a7982e1af5be28126d0ed95fa75ff195dc87f':
enable PDK to use platform JAVA API
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:03:41 +0000 (09:03 -0700)]
am
82af6ec8: Reconcile with jb-release nakasi-factoryrom-release
* commit '
82af6ec8ada9faa09439db0c491b68bcb801ccea':
JRN54
JRN53E
JRN53D
JRN53C
JRN53B
JRN53
JFN51B
JFN52
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
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
Elliott Hughes [Thu, 24 May 2012 00:32:32 +0000 (17:32 -0700)]
Compile Mac OS binaries with unwind tables for libcorkscrew.
Change-Id: I9755d8d39913830180da2ce32bcdd357309ff792
Jean-Baptiste Queru [Wed, 23 May 2012 23:18:35 +0000 (16:18 -0700)]
am
e4abb37a: am
27a4fa10: am
2d0055dd: Merge "Revert "Add module \'idmap\'.""
* commit '
e4abb37a73e73d26c1b7f9ddf427af8fa5f0ff0a':
Revert "Add module 'idmap'."
Jean-Baptiste Queru [Wed, 23 May 2012 23:16:30 +0000 (16:16 -0700)]
am
27a4fa10: am
2d0055dd: Merge "Revert "Add module \'idmap\'.""
* commit '
27a4fa10a90c754da307ddda14e16c3864dc0413':
Revert "Add module 'idmap'."
Jean-Baptiste Queru [Wed, 23 May 2012 23:14:45 +0000 (16:14 -0700)]
am
2d0055dd: Merge "Revert "Add module \'idmap\'.""
* commit '
2d0055dd3d3f067ef0ab2db6f8358b69d60880d9':
Revert "Add module 'idmap'."
Jean-Baptiste Queru [Wed, 23 May 2012 23:06:08 +0000 (16:06 -0700)]
Merge "Revert "Add module 'idmap'.""
Jean-Baptiste Queru [Wed, 23 May 2012 23:03:14 +0000 (16:03 -0700)]
Revert "Add module 'idmap'."
This reverts commit
eb7c4a5e9ed30ccb67ce386922c44abf7f5dc476.
Jean-Baptiste Queru [Wed, 23 May 2012 23:02:26 +0000 (16:02 -0700)]
am
a213c695: am
372936d8: am
c47b90a9: Merge "Add module \'idmap\'."
* commit '
a213c695a0e01fb0e34d3af4a09aa0c4f72c474a':
Add module 'idmap'.
Jean-Baptiste Queru [Wed, 23 May 2012 23:01:09 +0000 (16:01 -0700)]
am
372936d8: am
c47b90a9: Merge "Add module \'idmap\'."
* commit '
372936d881a2b64333c88ccb012ec57f80a2e424':
Add module 'idmap'.
Jean-Baptiste Queru [Wed, 23 May 2012 22:58:49 +0000 (15:58 -0700)]
am
c47b90a9: Merge "Add module \'idmap\'."
* commit '
c47b90a9a94b7f1cb452f0f0aa73696e382fe3c3':
Add module 'idmap'.
Jean-Baptiste Queru [Wed, 23 May 2012 21:39:59 +0000 (14:39 -0700)]
Merge "Add module 'idmap'."
Ying Wang [Wed, 23 May 2012 16:30:50 +0000 (09:30 -0700)]
am
ce21b820: am
9ccacd7a: Set PWD to the absolute path of the top tree.
* commit '
ce21b8204d5713fd0d511cc3635719dd4ca0bf75':
Set PWD to the absolute path of the top tree.
Ying Wang [Wed, 23 May 2012 16:28:26 +0000 (09:28 -0700)]
am
9ccacd7a: Set PWD to the absolute path of the top tree.
* commit '
9ccacd7a6f27dbb38c8365b85fb07197d1fdbb29':
Set PWD to the absolute path of the top tree.
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 Open Source Project [Tue, 22 May 2012 21:20:58 +0000 (14:20 -0700)]
am
70bdcefa: Reconcile with jb-release nakasi-factoryrom-release
* commit '
70bdcefaa2126a8897e13ad62e2297df00b2412d':
JRN52B
JRN52
JRN51C
JRN51B
JRN51
JFN47D
JRN50
JRN47E
JRN49
JRN47E
The Android Automerger [Tue, 22 May 2012 20:34:24 +0000 (13:34 -0700)]
JFN51B
The Android Automerger [Tue, 22 May 2012 20:29:18 +0000 (13:29 -0700)]
JFN52
The Android Automerger [Tue, 22 May 2012 20:21:40 +0000 (13:21 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Tue, 22 May 2012 20:04:52 +0000 (13:04 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I31e61a411d3ed4b3c721b634ae2c94c7b3760d3c
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
Andrew Hsieh [Tue, 22 May 2012 01:53:49 +0000 (18:53 -0700)]
am
6dfe3e11: Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp
* commit '
6dfe3e11a56707ce288a4dec8d3022ff61ef023f':
Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
Andrew Hsieh [Tue, 22 May 2012 01:51:52 +0000 (18:51 -0700)]
Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp
Jean-Baptiste Queru [Mon, 21 May 2012 21:30:47 +0000 (14:30 -0700)]
am
99e1613f: am
72b329e5: am
3c5191c6: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
* commit '
99e1613fd5d3773387b52910d7daa86535f42e25':
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
The Android Open Source Project [Mon, 21 May 2012 21:28:03 +0000 (14:28 -0700)]
am
d172e30a: Reconcile with jb-release nakasi-factoryrom-release
* commit '
d172e30aede4cc0b6751b3015ea6c8c036568aa0':
JRN47D
JRN48
JFN47C take 3
JFN47C
JFN47C take 2
JFN47C
JFN48
JRN47C
JRN47B
JRN47
force version reset
JRN47
JRN46D
JRN46C
JRN46B
The Android Automerger [Mon, 21 May 2012 19:52:03 +0000 (12:52 -0700)]
JRN51B
Andrew Hsieh [Mon, 21 May 2012 19:44:38 +0000 (12:44 -0700)]
am
112a6747: Add -mno-movbe to disable "movbe" instruction from code-gen
* commit '
112a674798c58052ddce94418e34f3e5a084ed1a':
Add -mno-movbe to disable "movbe" instruction from code-gen
Jean-Baptiste Queru [Mon, 21 May 2012 15:10:26 +0000 (08:10 -0700)]
am
72b329e5: am
3c5191c6: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
* commit '
72b329e5042b8fc15cbcbea3d382a072f79eb961':
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Jean-Baptiste Queru [Mon, 21 May 2012 15:07:59 +0000 (08:07 -0700)]
am
3c5191c6: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
* commit '
3c5191c61ac25a8dcdfdac61d591d66e3d20e380':
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Jean-Baptiste Queru [Mon, 21 May 2012 14:30:15 +0000 (07:30 -0700)]
Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
OSDN Git Service
