Keun young Park
ebfe97a558
am f89cd668
: am d8de82fb
: ignore touch error happening from broken symbolic link
...
* commit 'f89cd6689c6d39303e61dca88d0f84f8c8fea662':
ignore touch error happening from broken symbolic link
2012-05-25 14:07:47 -07:00
Keun young Park
f89cd6689c
am d8de82fb
: ignore touch error happening from broken symbolic link
...
* commit 'd8de82fbca4371ccefb41e02ac737e3a153901b3':
ignore touch error happening from broken symbolic link
2012-05-25 14:04:35 -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
Jean-Baptiste Queru
5399cbf1ea
am fe5d7c78
: am a2bfde63
: am fed2587c
: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
...
* commit 'fe5d7c788bc823f422f89c518949de5cbd77e996':
dalvik heapsize: Remove obsolete flag, set porperty
2012-05-25 07:35:55 -07:00
Jean-Baptiste Queru
d0f7d89546
am 4261ace0
: resolved conflicts for merge of 9f312b81
to jb-dev-plus-aosp
...
* commit '4261ace0139d7bb864d002d7a65be66945ec8878':
Enable DRM support in the SDK system image
2012-05-25 07:35:53 -07:00
Jean-Baptiste Queru
fe5d7c788b
am a2bfde63
: am fed2587c
: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
...
* commit 'a2bfde63b767378979145cb8be55d9a305e2b4f5':
dalvik heapsize: Remove obsolete flag, set porperty
2012-05-25 07:19:55 -07:00
Jean-Baptiste Queru
4261ace013
resolved conflicts for merge of 9f312b81
to jb-dev-plus-aosp
...
Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98
2012-05-25 07:16:04 -07:00
Elliott Hughes
f440828fa0
Merge "Compile Mac OS binaries with unwind tables for libcorkscrew."
2012-05-24 15:21:44 -07:00
Jean-Baptiste Queru
a2bfde63b7
am fed2587c
: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
...
* commit 'fed2587c164d27de79ca7900e920a15cbf62f990':
dalvik heapsize: Remove obsolete flag, set porperty
2012-05-24 14:27:52 -07:00
Jean-Baptiste Queru
9f312b8156
am 3deea32a
: Merge "Enable DRM support in the SDK system image"
...
* commit '3deea32a31e16d92d1d632b5a1bd260416f6e7d5':
Enable DRM support in the SDK system image
2012-05-24 14:27:51 -07:00
Keun young Park
97e6da8677
am 2b9a7982
: am ac440901
: Merge "enable PDK to use platform JAVA API" into jb-dev
...
* commit '2b9a7982e1af5be28126d0ed95fa75ff195dc87f':
enable PDK to use platform JAVA API
2012-05-24 12:57:07 -07:00
Keun young Park
2b9a7982e1
am ac440901
: Merge "enable PDK to use platform JAVA API" into jb-dev
...
* commit 'ac44090133e4e3a674be831d28d6d8cc661d2472':
enable PDK to use platform JAVA API
2012-05-24 12:54:57 -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
Jean-Baptiste Queru
fed2587c16
Merge "dalvik heapsize: Remove obsolete flag, set porperty"
2012-05-24 12:38:34 -07:00
Bruce Beare
5b21303927
dalvik heapsize: Remove obsolete flag, set porperty
...
Change-Id: I51360867171aaebce071b3391678ff6e7f191dc5
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
2012-05-24 11:38:18 -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
Jean-Baptiste Queru
3deea32a31
Merge "Enable DRM support in the SDK system image"
2012-05-24 10:14:05 -07:00
The Android Open Source Project
027e5c88c0
am 82af6ec8
: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '82af6ec8ada9faa09439db0c491b68bcb801ccea':
JRN54
JRN53E
JRN53D
JRN53C
JRN53B
JRN53
JFN51B
JFN52
2012-05-24 09:03:41 -07:00
The Android Open Source Project
82af6ec8ad
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Ib33447b73ea4b57a4eafa201c74879ecd31ae1a8
2012-05-24 09:00:57 -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
Elliott Hughes
468d6a584f
Compile Mac OS binaries with unwind tables for libcorkscrew.
...
Change-Id: I9755d8d39913830180da2ce32bcdd357309ff792
2012-05-23 17:32:32 -07:00
Jean-Baptiste Queru
0c9c2f88b7
am e4abb37a
: am 27a4fa10
: am 2d0055dd
: Merge "Revert "Add module \'idmap\'.""
...
* commit 'e4abb37a73e73d26c1b7f9ddf427af8fa5f0ff0a':
Revert "Add module 'idmap'."
2012-05-23 16:18:35 -07:00
Jean-Baptiste Queru
e4abb37a73
am 27a4fa10
: am 2d0055dd
: Merge "Revert "Add module \'idmap\'.""
...
* commit '27a4fa10a90c754da307ddda14e16c3864dc0413':
Revert "Add module 'idmap'."
2012-05-23 16:16:30 -07:00
Jean-Baptiste Queru
27a4fa10a9
am 2d0055dd
: Merge "Revert "Add module \'idmap\'.""
...
* commit '2d0055dd3d3f067ef0ab2db6f8358b69d60880d9':
Revert "Add module 'idmap'."
2012-05-23 16:14:45 -07:00
Jean-Baptiste Queru
2d0055dd3d
Merge "Revert "Add module 'idmap'.""
2012-05-23 16:06:08 -07:00
Jean-Baptiste Queru
4412133fb8
Revert "Add module 'idmap'."
...
This reverts commit eb7c4a5e9e
.
2012-05-23 16:03:14 -07:00
Jean-Baptiste Queru
50761e06f4
am a213c695
: am 372936d8
: am c47b90a9
: Merge "Add module \'idmap\'."
...
* commit 'a213c695a0e01fb0e34d3af4a09aa0c4f72c474a':
Add module 'idmap'.
2012-05-23 16:02:26 -07:00
Jean-Baptiste Queru
a213c695a0
am 372936d8
: am c47b90a9
: Merge "Add module \'idmap\'."
...
* commit '372936d881a2b64333c88ccb012ec57f80a2e424':
Add module 'idmap'.
2012-05-23 16:01:09 -07:00
Jean-Baptiste Queru
372936d881
am c47b90a9
: Merge "Add module \'idmap\'."
...
* commit 'c47b90a9a94b7f1cb452f0f0aa73696e382fe3c3':
Add module 'idmap'.
2012-05-23 15:58:49 -07:00
Jean-Baptiste Queru
c47b90a9a9
Merge "Add module 'idmap'."
2012-05-23 14:40:00 -07:00
Ying Wang
13054c3653
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.
2012-05-23 09:30:50 -07:00
Ying Wang
ce21b8204d
am 9ccacd7a
: Set PWD to the absolute path of the top tree.
...
* commit '9ccacd7a6f27dbb38c8365b85fb07197d1fdbb29':
Set PWD to the absolute path of the top tree.
2012-05-23 09:28:26 -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 Open Source Project
8c761dbc3c
am 70bdcefa
: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '70bdcefaa2126a8897e13ad62e2297df00b2412d':
JRN52B
JRN52
JRN51C
JRN51B
JRN51
JFN47D
JRN50
JRN47E
JRN49
JRN47E
2012-05-22 14:20:58 -07:00
The Android Automerger
e2875fa799
JFN51B
2012-05-22 13:34:24 -07:00
The Android Automerger
7a004a2ac7
JFN52
2012-05-22 13:29:18 -07:00
The Android Automerger
a2238c7a1f
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-22 13:21:40 -07:00
The Android Open Source Project
70bdcefaa2
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I31e61a411d3ed4b3c721b634ae2c94c7b3760d3c
2012-05-22 13:04:52 -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
Andrew Hsieh
0fc900754d
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
2012-05-21 18:53:49 -07:00