OSDN Git Service
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
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
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
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
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
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: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: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 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:51:52 +0000 (18:51 -0700)]
Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp
The Android Automerger [Mon, 21 May 2012 19:52:03 +0000 (12:52 -0700)]
JRN51B
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"
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
Andrew Hsieh [Mon, 21 May 2012 06:27:59 +0000 (14:27 +0800)]
Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason
that atom-specific instruciton like "movbe" isn't "generic" to
x86 Android devices and x86 host running emulator-x86, which may
crash non-atom host in VT because "movbe" isn't supported natively.
Also revert previous fix in TARGET_linux-x86.mk which conservatively
disable "movbe" across the board
Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
The Android Automerger [Mon, 21 May 2012 06:15:43 +0000 (23:15 -0700)]
JFN47D
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 Open Source Project [Sat, 19 May 2012 01:41:56 +0000 (18:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ic5f9f074942c800ffb75e0c36212a8143a5b06f6
The Android Automerger [Fri, 18 May 2012 22:21:39 +0000 (15:21 -0700)]
JRN47D
The Android Automerger [Fri, 18 May 2012 21:55:08 +0000 (14:55 -0700)]
JRN48
The Android Automerger [Fri, 18 May 2012 19:32:30 +0000 (12:32 -0700)]
JFN47C take 3
The Android Automerger [Fri, 18 May 2012 19:31:42 +0000 (12:31 -0700)]
JFN47C
The Android Automerger [Fri, 18 May 2012 19:16:59 +0000 (12:16 -0700)]
JFN47C take 2
The Android Automerger [Fri, 18 May 2012 18:37:02 +0000 (11:37 -0700)]
JFN47C
The Android Automerger [Fri, 18 May 2012 17:54:03 +0000 (10:54 -0700)]
JFN48
The Android Automerger [Fri, 18 May 2012 17:45:30 +0000 (10:45 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
Andrew Hsieh [Fri, 18 May 2012 07:53:35 +0000 (15:53 +0800)]
Add -mno-movbe to disable "movbe" instruction from code-gen
Intruction "movbe" (move data after swapping bytes) is only available in
Intel atom. Disable it for more general x86 devices and x86 hosts which
run emulator-x86. Although emulator-x86 can support "movbe", most of
the time we want to run emulator-x86 with VT support for speed (with KVM
in Linux, or HAXM in Windows/MacOSX). The presence of "movbe" can crash
emulator-x86 in VT because non-atom host doesn't have it natively.
Change-Id: I86e037900ddcb8d544f92b8d8464c8627347e560
The Android Automerger [Thu, 17 May 2012 22:51:47 +0000 (15:51 -0700)]
JRN47C
The Android Automerger [Thu, 17 May 2012 22:05:00 +0000 (15:05 -0700)]
JRN47B
The Android Automerger [Thu, 17 May 2012 16:27:59 +0000 (09:27 -0700)]
JRN47
The Android Automerger [Thu, 17 May 2012 16:25:37 +0000 (09:25 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 17 May 2012 16:25:00 +0000 (09:25 -0700)]
force version reset
The Android Automerger [Thu, 17 May 2012 14:11:04 +0000 (07:11 -0700)]
JRN47
The Android Automerger [Thu, 17 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 16 May 2012 23:50:44 +0000 (16:50 -0700)]
JRN46D
The Android Automerger [Wed, 16 May 2012 22:52:26 +0000 (15:52 -0700)]
JRN46C
Jean-Baptiste Queru [Wed, 16 May 2012 20:18:39 +0000 (13:18 -0700)]
resolved conflicts for merge of
62855a83 to jb-dev-plus-aosp
Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07
The Android Automerger [Wed, 16 May 2012 19:47:02 +0000 (12:47 -0700)]
JRN46B
Nick Kralevich [Wed, 16 May 2012 16:14:24 +0000 (09:14 -0700)]
am
cced446c: am
9db21482: Merge "stop using a custom linker script for static executables."
* commit '
cced446c7fb11412e100a579a9ba1ef051e24686':
stop using a custom linker script for static executables.
The Android Open Source Project [Wed, 16 May 2012 15:39:57 +0000 (08:39 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I17f88425d34e570293c17fb39d92f363e982c002
The Android Automerger [Wed, 16 May 2012 14:56:08 +0000 (07:56 -0700)]
JFN46
Jean-Baptiste Queru [Wed, 16 May 2012 14:55:00 +0000 (07:55 -0700)]
am
2436ea8a: Merge "Use i686-linux-android-4.6 for x86 build"
* commit '
2436ea8a8c84d58befb4bf27d137d94c45b8cc8d':
Use i686-linux-android-4.6 for x86 build
The Android Automerger [Wed, 16 May 2012 14:42:57 +0000 (07:42 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Wed, 16 May 2012 14:10:44 +0000 (07:10 -0700)]
JRN46
The Android Automerger [Wed, 16 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Baptiste Queru [Wed, 16 May 2012 13:42:53 +0000 (06:42 -0700)]
Merge "Use i686-linux-android-4.6 for x86 build"
James Dong [Wed, 16 May 2012 08:22:31 +0000 (01:22 -0700)]
am
4007faf4: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
* commit '
4007faf4c6bb99883f6ac7a8d80a956837909ff8':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
James Dong [Tue, 15 May 2012 07:45:19 +0000 (00:45 -0700)]
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug:
6502980
Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
Nick Kralevich [Tue, 15 May 2012 23:39:59 +0000 (16:39 -0700)]
am
9db21482: Merge "stop using a custom linker script for static executables."
* commit '
9db21482369c20120d6f4c1078ce7e0405ba3148':
stop using a custom linker script for static executables.
The Android Automerger [Tue, 15 May 2012 22:51:10 +0000 (15:51 -0700)]
JRN45B
Ying Wang [Tue, 15 May 2012 22:20:01 +0000 (15:20 -0700)]
am
f446039e: Merge "Don\'t set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev
* commit '
f446039efb2e4d8a520c8f83dabc375c6d1370dd':
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
Ying Wang [Tue, 15 May 2012 22:16:33 +0000 (15:16 -0700)]
Merge "Don't set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev
Nick Kralevich [Tue, 15 May 2012 22:09:25 +0000 (15:09 -0700)]
Merge "stop using a custom linker script for static executables."
James Dong [Tue, 15 May 2012 21:59:09 +0000 (14:59 -0700)]
am
c8bfb1ca: Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
* commit '
c8bfb1cad15822f31e3f3250d00b4ef6761c19c4':
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
James Dong [Tue, 15 May 2012 21:47:37 +0000 (14:47 -0700)]
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
Fixed the broken build first.
This reverts commit
e85f05be147bf7d916d1b1622f6f3038dac8913b.
Ying Wang [Tue, 15 May 2012 21:31:26 +0000 (14:31 -0700)]
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
James Dong [Tue, 15 May 2012 21:27:02 +0000 (14:27 -0700)]
am
e85f05be: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
* commit '
e85f05be147bf7d916d1b1622f6f3038dac8913b':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
Nick Kralevich [Tue, 1 Nov 2011 17:59:35 +0000 (10:59 -0700)]
stop using a custom linker script for static executables.
This is causing problems with making the linker relocatable.
Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
The Android Automerger [Tue, 15 May 2012 16:38:40 +0000 (09:38 -0700)]
JFN45
The Android Automerger [Tue, 15 May 2012 16:33:03 +0000 (09:33 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Tue, 15 May 2012 14:11:21 +0000 (07:11 -0700)]
JRN45
The Android Automerger [Tue, 15 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
James Dong [Tue, 15 May 2012 07:45:19 +0000 (00:45 -0700)]
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug:
6328360
Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
Ying Wang [Tue, 15 May 2012 02:34:26 +0000 (19:34 -0700)]
am
3ceecfa3: Check the well-formedness of an xml file before copying.
* commit '
3ceecfa3daeb187c0631a84e6ee6b4dd89f111f8':
Check the well-formedness of an xml file before copying.
The Android Automerger [Tue, 15 May 2012 00:49:29 +0000 (17:49 -0700)]
JRN44C