OSDN Git Service
The Android Open Source Project [Tue, 27 Mar 2012 16:58:53 +0000 (09:58 -0700)]
The Android Open Source Project [Tue, 27 Mar 2012 16:58:52 +0000 (09:58 -0700)]
am
c8b1ca18: am
6e271c76: Reconcile with ics-mr1-release
* commit '
c8b1ca18c7bdf3e71f2bcd6d49ba3e1b2b817d43':
IMM76D
IMM76C
Glenn Kasten [Tue, 27 Mar 2012 00:54:22 +0000 (17:54 -0700)]
Merge "mv wilhelm"
Glenn Kasten [Tue, 27 Mar 2012 00:50:44 +0000 (17:50 -0700)]
mv wilhelm
Change-Id: I3c1573a3dcb0567cf330fe06b3ae70b3b8f66978
Stephen Hines [Tue, 27 Mar 2012 00:44:29 +0000 (17:44 -0700)]
Merge "Skip host system directories in Clang include path."
Kenny Root [Mon, 26 Mar 2012 19:38:16 +0000 (12:38 -0700)]
Add hardware API libs and SSL engines to gdb path
Hardware API implementations and SSL engines are stored as a
subdirectory to the /system/lib directory. This makes it easier to debug
them with the "gdbclient" command.
Change-Id: If7c3c7ffbca87425aac85d527e44fbea3bb025ad
The Android Open Source Project [Mon, 26 Mar 2012 17:21:29 +0000 (10:21 -0700)]
am
6aa8411f: Reconcile with ics-mr1-release
* commit '
6aa8411f2f1258cecd4c1fb593195568d08fef18':
The Android Open Source Project [Mon, 26 Mar 2012 17:18:02 +0000 (10:18 -0700)]
Reconcile with ics-mr1-release
Change-Id: I9d8982c6fae0eb770c95f3b480bc6be0976c11b2
The Android Open Source Project [Mon, 26 Mar 2012 16:49:11 +0000 (09:49 -0700)]
am
6e271c76: Reconcile with ics-mr1-release
* commit '
6e271c76b6906da529804c3672115a9a88fd8e30':
IMM76D
IMM76C
The Android Open Source Project [Mon, 26 Mar 2012 16:47:10 +0000 (09:47 -0700)]
Reconcile with ics-mr1-release
Change-Id: I9be3678a1dc959923c5eb572e2b6f8243c446157
Evgeniy Stepanov [Mon, 26 Mar 2012 10:15:47 +0000 (14:15 +0400)]
Skip host system directories in Clang include path.
This change removes /usr/include and /usr/local/include from Clang header
search path.
Change-Id: I84450f4f4aef829c5aef9221bf300e69819bac48
James Dong [Sun, 25 Mar 2012 23:40:57 +0000 (16:40 -0700)]
Merge "Added /frameworks/av/include to the default include search path"
The Android Automerger [Sun, 25 Mar 2012 19:34:33 +0000 (12:34 -0700)]
IMM76D
James Dong [Sat, 24 Mar 2012 01:46:42 +0000 (18:46 -0700)]
Added /frameworks/av/include to the default include search path
o related-to-bug:
6214141
Change-Id: I90de0563298fd9146ac823926426d1cffd815c2d
Brian Swetland [Sat, 24 Mar 2012 01:26:31 +0000 (18:26 -0700)]
Merge "Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK"
Brian Swetland [Fri, 23 Mar 2012 23:04:13 +0000 (16:04 -0700)]
Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK
BUILD_PDK and some of the other infrastructure will go away once
we're done with the new new PDK work, but for now don't disturb
that stuff.
Change-Id: Ia39bf759ec03f203858ddcc4880af72bd132cb5a
The Android Automerger [Fri, 23 Mar 2012 21:38:56 +0000 (14:38 -0700)]
IMM76C
Mathias Agopian [Fri, 23 Mar 2012 21:23:41 +0000 (14:23 -0700)]
move ndk headers to frameworks/native
Change-Id: Ie92ca68bb9f99b2d5a1dbdfc9e57f3f986265386
Mike Lockwood [Fri, 23 Mar 2012 19:58:30 +0000 (12:58 -0700)]
Merge "Add build.prop to factory ramdisk"
Nick Sanders [Tue, 31 Jan 2012 03:25:21 +0000 (19:25 -0800)]
Add build.prop to factory ramdisk
We'll need a special case to set device properties on the factory ramdisk
Change-Id: I146d5c503e8c97005caa1ab1dbaca7ee9ab30faf
Signed-off-by: Nick Sanders <nsanders@google.com>
Raphael Moll [Fri, 23 Mar 2012 17:45:20 +0000 (10:45 -0700)]
Fix build: Revert "SDK: Enable monitor in sdk product."
This reverts commit
0022a035d689a0915a500e2ca88f104d20ffb71f.
James Dong [Fri, 23 Mar 2012 16:20:58 +0000 (09:20 -0700)]
Merge "Fix missing xml configuration files for sdk builds"
Raphael Moll [Fri, 23 Mar 2012 16:16:04 +0000 (09:16 -0700)]
Merge "SDK: Enable monitor in sdk product."
Stephen Hines [Fri, 23 Mar 2012 12:33:17 +0000 (05:33 -0700)]
Merge "Make sure compiler flags also pick up correct toolchain."
Stephen Hines [Fri, 23 Mar 2012 04:26:17 +0000 (21:26 -0700)]
Make sure compiler flags also pick up correct toolchain.
Change-Id: Id6ff8c3ee7cfa5dee46ef000cbceb7666b934240
James Dong [Fri, 23 Mar 2012 02:05:10 +0000 (19:05 -0700)]
Fix missing xml configuration files for sdk builds
o related-to-bug:
6132480
Change-Id: Ib08ce4cf7ef4d85ab888804c7c4a3d1337370e52
Colin Cross [Fri, 23 Mar 2012 01:47:23 +0000 (18:47 -0700)]
build: move Zip* from libandroidfw to libutils
ZipUtils is needed by build/tools, move it from libandroidfw
(frameworks/base) to libutils (frameworks/native).
Change-Id: I188247d058f1baa0ebd14282208d496c4ba061be
Ying Wang [Thu, 22 Mar 2012 18:27:17 +0000 (11:27 -0700)]
Merge "Don't expose the compiler dependency."
Ying Wang [Thu, 22 Mar 2012 18:26:22 +0000 (11:26 -0700)]
Don't expose the compiler dependency.
Change-Id: Ia472eaab3e8e883a32e8b441a2480562db278e45
Andrew Hsieh [Thu, 22 Mar 2012 18:08:57 +0000 (11:08 -0700)]
am
f2b45aa6: am
5d9aedef: am
2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '
f2b45aa676a154ddb3649e3b95d16f6b82392dec':
Point to new linux prebuilt toolchain for SDK build
Andrew Hsieh [Thu, 22 Mar 2012 18:06:34 +0000 (11:06 -0700)]
am
5d9aedef: am
2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '
5d9aedef3067d458e356a6c13a26ad71041ff04b':
Point to new linux prebuilt toolchain for SDK build
Andrew Hsieh [Thu, 22 Mar 2012 18:03:14 +0000 (11:03 -0700)]
am
2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '
2245d17dc847ecb5371807466788552ca0198152':
Point to new linux prebuilt toolchain for SDK build
Andrew Hsieh [Tue, 13 Mar 2012 09:17:35 +0000 (02:17 -0700)]
Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
Evgeniy Stepanov [Tue, 20 Mar 2012 14:00:16 +0000 (18:00 +0400)]
Add LOCAL_CLANG variable to switch C/C++ build environment to Clang.
Change-Id: I8ca1c24f51aa5546ac9618d31566a52e4fdb1436
Conflicts:
core/clear_vars.mk
Stephen Hines [Thu, 22 Mar 2012 14:28:41 +0000 (07:28 -0700)]
Merge "Define a basic llvm-link + clang environment"
Raphael Moll [Thu, 22 Mar 2012 00:29:50 +0000 (17:29 -0700)]
SDK: Enable monitor in sdk product.
Requires change sdk.git change I7afbd63b
Change-Id: Ifb31e2e36ea92a0fdd0996a387c00f0edc2e4218
Mike Lockwood [Thu, 22 Mar 2012 00:08:39 +0000 (17:08 -0700)]
Merge remote-tracking branch 'goog/ics-aah-exp'
Mike Lockwood [Thu, 22 Mar 2012 00:08:21 +0000 (17:08 -0700)]
Mike Lockwood [Thu, 22 Mar 2012 00:08:00 +0000 (17:08 -0700)]
Merge commit '
a66c512'
empty -s ours merge
Change-Id: Id71a9514bdf0a8ca9c4c5ab847387b8ea544d0ab
Mike Lockwood [Thu, 22 Mar 2012 00:01:07 +0000 (17:01 -0700)]
Merge commit '
c6e952f'
Don't build userdata.img for tests build.
Change-Id: I492cca5e5989cabdeb6f75c3b8a8c9ac3b9ca8c8
Mike Lockwood [Thu, 22 Mar 2012 00:00:43 +0000 (17:00 -0700)]
Merge commit '
c20c683'
empty -s ours merge
Change-Id: I877d10b1d4459d148724353ed2a95764c3dbf0ae
Mike Lockwood [Wed, 21 Mar 2012 23:58:35 +0000 (16:58 -0700)]
Merge commit '
2d50524'
empty -s ours merge to skip change:
main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS
Change-Id: Id79485ba1c5ddae222e4d7bedb05efadff168f00
Mike Lockwood [Wed, 21 Mar 2012 23:55:23 +0000 (16:55 -0700)]
Steve Block [Wed, 21 Mar 2012 17:17:46 +0000 (10:17 -0700)]
Merge "Add a comment about publishing licenses for third-party code"
Steve Block [Thu, 1 Mar 2012 11:34:41 +0000 (11:34 +0000)]
Add a comment about publishing licenses for third-party code
Change-Id: I21bee0bb78ab42b4f7b6a938f94653c7e21e8503
Doug Zongker [Wed, 21 Mar 2012 17:01:01 +0000 (10:01 -0700)]
fix build: make check_radio_versions.py okay with no args
Change-Id: I3539383d9761b57152c04ba9198c724509ba6223
Doug Zongker [Wed, 21 Mar 2012 16:47:25 +0000 (09:47 -0700)]
Merge "optional cross-check between OTA radio images and board-info.txt"
Doug Zongker [Tue, 20 Mar 2012 23:42:22 +0000 (16:42 -0700)]
optional cross-check between OTA radio images and board-info.txt
Adds a python script which checks the version of each radio image
added with the new add-radio-file-checked macro against a file
containing sha-1 -> version string mappings and the contents of
board-info.txt, so that the build can fail if board-info.txt and the
OTA images are out of sync.
Change-Id: Icb61dc2adefc240ced9059941582c23b629089c0
The Android Open Source Project [Wed, 21 Mar 2012 16:05:53 +0000 (09:05 -0700)]
The Android Open Source Project [Wed, 21 Mar 2012 16:03:25 +0000 (09:03 -0700)]
am
8544aac8: Reconcile with ics-mr1-release
* commit '
8544aac859400ee7c0109f996930b22455028dbe':
The Android Open Source Project [Wed, 21 Mar 2012 16:00:34 +0000 (09:00 -0700)]
Reconcile with ics-mr1-release
Change-Id: If78df17136dfe425e6752b315590b47d4c135d21
The Android Open Source Project [Wed, 21 Mar 2012 15:27:29 +0000 (08:27 -0700)]
am
cd68729d: am
7000342d: Reconcile with ics-mr1-release
* commit '
cd68729dece4b654265c61bafd2ed05575fbdab2':
IMM76B
IMM76
IMM72B
IMM72
second try
IMM68C
IMM70
IMM62B
IMM69
IMM68B
IMM68
The Android Open Source Project [Wed, 21 Mar 2012 15:25:04 +0000 (08:25 -0700)]
am
7000342d: Reconcile with ics-mr1-release
* commit '
7000342da9241170fa831a8ec887ecc6f4aa426d':
IMM76B
IMM76
IMM72B
IMM72
second try
IMM68C
IMM70
IMM62B
IMM69
IMM68B
IMM68
The Android Open Source Project [Wed, 21 Mar 2012 15:22:52 +0000 (08:22 -0700)]
Reconcile with ics-mr1-release
Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8
Ying Wang [Wed, 21 Mar 2012 02:36:30 +0000 (19:36 -0700)]
am
0187511e: am
4243532d: am
301843ae: am
29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '
0187511e70960618ac5c84f1446ec955ba6c8955':
Fix for "dexopt: No such file or directory" error
The Android Automerger [Wed, 21 Mar 2012 00:15:23 +0000 (17:15 -0700)]
IMM76B
Ying Wang [Tue, 20 Mar 2012 22:24:55 +0000 (15:24 -0700)]
am
4243532d: am
301843ae: am
29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '
4243532d4a0ec368d6722265af94ebd962877623':
Fix for "dexopt: No such file or directory" error
Ying Wang [Tue, 20 Mar 2012 22:22:30 +0000 (15:22 -0700)]
am
301843ae: am
29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '
301843ae3e5a5d121ecc01b58ea3f15ae07c860f':
Fix for "dexopt: No such file or directory" error
Ying Wang [Tue, 20 Mar 2012 22:20:14 +0000 (15:20 -0700)]
am
29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '
29e44b7a8300644516b021e9e324ffe426098b3f':
Fix for "dexopt: No such file or directory" error
James Dong [Tue, 20 Mar 2012 18:36:25 +0000 (11:36 -0700)]
Merge "Added media_codecs.xml file to generic_x86 and vbox_x86 configuration files"
Ying Wang [Tue, 20 Mar 2012 18:05:55 +0000 (11:05 -0700)]
Merge "Fix for "dexopt: No such file or directory" error"
yroussel [Thu, 12 Jan 2012 15:09:06 +0000 (16:09 +0100)]
Define a basic llvm-link + clang environment
Move it from dalvik/vm/translator/runtime/ to build/
Add handling of -march=armv5te and -march=armv5e
James Dong [Mon, 19 Mar 2012 21:05:05 +0000 (14:05 -0700)]
Added media_codecs.xml file to generic_x86 and vbox_x86 configuration files
o related-to-bug:
6132480
Change-Id: I82753468676d3b1ecba892c993de11ef779eed01
Dima Zavin [Fri, 16 Mar 2012 23:20:52 +0000 (16:20 -0700)]
core: the device/board/product kernel headers will be auto-generated
So, just add the output include directory to the include path
Change-Id: Ia370454237913a748288124f65a6b731b17d6e1a
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Fri, 16 Mar 2012 16:57:11 +0000 (09:57 -0700)]
core: allow product to provide kernel headers as well
This is useful when a device inherits from an architecture
product, such as omap4.mk. The architecture specific product
can provide kernel headers to all the devices that use
that architecture.
Change-Id: I0c9d3120a6089fb535a3fa8eccf10775a271cd21
Signed-off-by: Dima Zavin <dima@android.com>
The Android Automerger [Sat, 17 Mar 2012 02:36:35 +0000 (19:36 -0700)]
IMM76
The Android Automerger [Sat, 17 Mar 2012 02:30:18 +0000 (19:30 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Keun young Park [Fri, 16 Mar 2012 19:35:40 +0000 (12:35 -0700)]
Merge "rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel"
Dima Zavin [Thu, 15 Mar 2012 06:50:17 +0000 (23:50 -0700)]
core: allow devices to provide their own device specific kernel headers
Currently, we need to pollute the common bionic/libc/kernel/...
directory with device specific kernel headers. This has created a giant
dumping ground of headers from all the projects we have ever done.
Allow each device to provide their own headers and thus eventually allow
bionic/libc/kernel to become *just* the common linux kernel headers.
This change will automatically add device/oem/name/kernel-headers to
the include list and also allow the BoardConfig.mk to specify
additional directories with TARGET_BOARD_KERNEL_HEADERS variable.
The requirement is that the final dir name must be kernel-headers to
mark explicitly where kernel headers are kept.
Change-Id: I7d32a979eef1f464db06c1bc448a04ddc3575efd
Signed-off-by: Dima Zavin <dima@android.com>
Keun young Park [Thu, 15 Mar 2012 19:23:05 +0000 (12:23 -0700)]
rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel
Change-Id: Iadf0493b1f6700638010ceb50ced2fe7bc8bb603
Glenn Kasten [Wed, 14 Mar 2012 23:42:17 +0000 (16:42 -0700)]
Merge "Use pathmap.mk for system/media includes"
Glenn Kasten [Tue, 13 Mar 2012 22:23:33 +0000 (15:23 -0700)]
Use pathmap.mk for system/media includes
Currently these point to the old location.
Another CL will move them to the new location.
Change-Id: I61dd732981a9a7a3f4a2c1cc01dc072f4fb6a2b8
Andreas Huber [Wed, 14 Mar 2012 15:15:18 +0000 (08:15 -0700)]
Merge "Make sure to copy codec setup files to their proper filesystem location on the emulator"
Ying Wang [Wed, 14 Mar 2012 02:49:59 +0000 (19:49 -0700)]
Fix tests build.
Use the conditional only after the tests build variant is phased out.
Change-Id: Ide691700dda4bbf56c6f81f923d1b8c5eb196b85
Ying Wang [Wed, 14 Mar 2012 02:13:19 +0000 (19:13 -0700)]
Merge "Add build goal "tests"."
Ying Wang [Wed, 14 Mar 2012 01:58:27 +0000 (18:58 -0700)]
Add build goal "tests".
Bug:
5368571
The phony build goal "tests" will eventually replace the build variant
tests.
Change-Id: Ia656f2cf2260feeaa8fa32e9221b7f9ce0990262
The Android Automerger [Wed, 14 Mar 2012 00:16:36 +0000 (17:16 -0700)]
IMM72B
Romain Guy [Tue, 13 Mar 2012 23:56:17 +0000 (16:56 -0700)]
Make adbs work again on Darwin x86.
We don't support building on Darwin PPC so let's always assume x86.
Change-Id: I079a4040f1c0a144d4cdd1e2b3d2a183c00bf7b0
Andrew Hsieh [Tue, 13 Mar 2012 22:48:21 +0000 (15:48 -0700)]
Merge "Point to new linux prebuilt toolchain for SDK build"
Ying Wang [Tue, 13 Mar 2012 20:00:46 +0000 (13:00 -0700)]
Merge "Remove system partition files from the test zip file."
Ying Wang [Tue, 13 Mar 2012 18:22:04 +0000 (11:22 -0700)]
Remove system partition files from the test zip file.
Bug:
6157562
Change-Id: I581c6db7d47b42617f8ef6097ccd0aae52c7e1b4
Andreas Huber [Tue, 13 Mar 2012 16:01:51 +0000 (09:01 -0700)]
Make sure to copy codec setup files to their proper filesystem location on the emulator
Change-Id: I97b6944646fcabc754526ef88f7fdd63d0d1da0a
Andrew Hsieh [Tue, 13 Mar 2012 09:17:35 +0000 (02:17 -0700)]
Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
Svetoslav Ganov [Mon, 12 Mar 2012 23:49:58 +0000 (16:49 -0700)]
Adding clean variables for some variables used in CTS.
1. A CTS package can specify the test runner used to launch
its tests from the device. This is useful for preparing
and cleaning the device through some shell commands if
necessary.
bug:
5946699
Change-Id: Ib1d6454c4274b1c37323235c9b3a195f3b9d8131
The Android Automerger [Tue, 13 Mar 2012 02:36:17 +0000 (19:36 -0700)]
IMM72
The Android Automerger [Tue, 13 Mar 2012 02:30:56 +0000 (19:30 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Ying Wang [Mon, 12 Mar 2012 19:12:38 +0000 (12:12 -0700)]
Merge "Fix build caused by 168380"
Keun young Park [Mon, 12 Mar 2012 19:10:42 +0000 (12:10 -0700)]
Fix build caused by 168380
Change-Id: Iebda5669f48fe505146b8f2f8b35d06621d4b0e6
Keun young Park [Mon, 12 Mar 2012 18:57:39 +0000 (11:57 -0700)]
Merge "changes to add pdk1 / pdk2 build for PDK build - additional files will be added to pdk/build Bug:
6079146"
Keun young Park [Mon, 27 Feb 2012 23:49:23 +0000 (15:49 -0800)]
changes to add pdk1 / pdk2 build for PDK build
- additional files will be added to pdk/build
Bug:
6079146
Change-Id: Ieb5fcab8002193250d770b923f60ec7333ce84e5
The Android Automerger [Sun, 11 Mar 2012 08:58:08 +0000 (00:58 -0800)]
second try
The Android Automerger [Sat, 10 Mar 2012 17:10:29 +0000 (09:10 -0800)]
IMM68C
The Android Automerger [Sat, 10 Mar 2012 17:08:53 +0000 (09:08 -0800)]
IMM70
The Android Automerger [Sat, 10 Mar 2012 17:06:03 +0000 (09:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 10 Mar 2012 03:28:10 +0000 (19:28 -0800)]
IMM62B
The Android Automerger [Sat, 10 Mar 2012 03:25:45 +0000 (19:25 -0800)]
IMM69
The Android Automerger [Sat, 10 Mar 2012 03:22:16 +0000 (19:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Michel Trivi [Sat, 10 Mar 2012 02:52:00 +0000 (18:52 -0800)]
Include the downmix effect in the platform
Change-Id: Ifc05bb7edc06994623848adf568524a98f0f316a
The Android Automerger [Fri, 9 Mar 2012 17:59:12 +0000 (09:59 -0800)]
IMM68B
Chih-Chung Chang [Fri, 9 Mar 2012 09:20:58 +0000 (01:20 -0800)]
Merge "Remove Camera package (it's merged into Gallery package)."