OSDN Git Service
James Dong [Thu, 29 Mar 2012 01:59:34 +0000 (18:59 -0700)]
install drm libraries and drmserver to the core product, which covers sdk build
o related-to-bug:
6246463
Change-Id: Ifaef3cd71d05c7e1ca3d7b3c459bfa4bea0d2e20
Brian Swetland [Wed, 28 Mar 2012 22:31:33 +0000 (15:31 -0700)]
Merge "don't build apicheck for PDK builds, removing dependency on doclava"
Brian Swetland [Wed, 28 Mar 2012 22:30:36 +0000 (15:30 -0700)]
don't build apicheck for PDK builds, removing dependency on doclava
PDK builds have no Java APIs...
Change-Id: I719e0c206234d03a70f3178fd618676f8ee0e6f4
Alex Sakhartchouk [Wed, 28 Mar 2012 22:09:01 +0000 (15:09 -0700)]
Merge "Moving libRS"
Alex Sakhartchouk [Wed, 28 Mar 2012 21:22:55 +0000 (14:22 -0700)]
Moving libRS
Change-Id: I45058b3e1cc213db6e322090f86dd19a6747fc4c
Anatol Pomazau [Wed, 28 Mar 2012 19:21:22 +0000 (12:21 -0700)]
Merge "audio configuration file path change because it is relocated"
Colin Cross [Wed, 28 Mar 2012 16:33:14 +0000 (09:33 -0700)]
Add samsung_arm as an owner
Add samsung_arm as an owner to be used on files that depend
on licenses from both Samsung and ARM.
Change-Id: I03a5ba739b940915519f75477adea7c2a9b0a563
Colin Cross [Wed, 28 Mar 2012 16:34:16 +0000 (09:34 -0700)]
Merge "telephony: remove default apns_conf.xml"
Kenny Root [Wed, 28 Mar 2012 03:41:57 +0000 (20:41 -0700)]
Merge "Move keystore from user_tags to core req"
Raphael Moll [Wed, 28 Mar 2012 00:58:57 +0000 (17:58 -0700)]
am
5d2f6cb1: am
f515ad27: am
b6addfb2: am
a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
* commit '
5d2f6cb1b1901521194e8a9f5d7d50b6260d71e6':
Allow make 3.82 to be used under Cygwin 1.7
Raphael Moll [Wed, 28 Mar 2012 00:58:56 +0000 (17:58 -0700)]
am
be8d46c7: am
d0bcf386: am
2696eb6d: am
3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '
be8d46c70e70c451e9cae90e5801623029050c4f':
SDK atree: support HOST_OUT location.
Raphael Moll [Wed, 28 Mar 2012 00:57:40 +0000 (17:57 -0700)]
am
f515ad27: am
b6addfb2: am
a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
* commit '
f515ad27974dc18a2ae2579cee16a800d539d06d':
Allow make 3.82 to be used under Cygwin 1.7
Raphael Moll [Wed, 28 Mar 2012 00:57:39 +0000 (17:57 -0700)]
am
d0bcf386: am
2696eb6d: am
3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '
d0bcf3869e8f60892dea6983ed2b9ff6e6d203f5':
SDK atree: support HOST_OUT location.
Raphael Moll [Wed, 28 Mar 2012 00:55:44 +0000 (17:55 -0700)]
am
b6addfb2: am
a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
* commit '
b6addfb250606175ca679c8fb6e549cd98eee5b0':
Allow make 3.82 to be used under Cygwin 1.7
Raphael Moll [Wed, 28 Mar 2012 00:55:43 +0000 (17:55 -0700)]
am
2696eb6d: am
3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '
2696eb6d11759e8a0cd839e9f10c90e38efea21a':
SDK atree: support HOST_OUT location.
Raphael Moll [Wed, 28 Mar 2012 00:53:32 +0000 (17:53 -0700)]
am
a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
* commit '
a8dd58a8a604ed90c5fd5fb632eb2bb8b1ff8fa0':
Allow make 3.82 to be used under Cygwin 1.7
Raphael Moll [Wed, 28 Mar 2012 00:53:32 +0000 (17:53 -0700)]
am
3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '
3b1ebe7dc291175886f21ffbbccdb98b560efabf':
SDK atree: support HOST_OUT location.
Dima Zavin [Tue, 27 Mar 2012 19:30:20 +0000 (12:30 -0700)]
telephony: remove default apns_conf.xml
Remove the hack from main.mk to filter through installed files
to look for an apns file.
Change-Id: I31ba69bfc8323fea0a38154922df6b57a0f227c8
Signed-off-by: Dima Zavin <dima@android.com>
Marius Renn [Tue, 27 Mar 2012 23:29:47 +0000 (16:29 -0700)]
Merge "Multi-Project Commit: Move of filterfw out of system/media (3 of 7)"
Raphael Moll [Tue, 27 Mar 2012 23:16:45 +0000 (16:16 -0700)]
Merge "Allow make 3.82 to be used under Cygwin 1.7"
Raphael Moll [Tue, 27 Mar 2012 17:07:42 +0000 (10:07 -0700)]
Allow make 3.82 to be used under Cygwin 1.7
(Manual merge of
76bf62d75e7d4680dac1522534c56f4b511e5cd1)
Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
Raphael Moll [Tue, 27 Mar 2012 18:40:46 +0000 (11:40 -0700)]
Merge "SDK atree: support HOST_OUT location."
Marius Renn [Tue, 27 Mar 2012 17:46:13 +0000 (10:46 -0700)]
Multi-Project Commit: Move of filterfw out of system/media (3 of 7)
This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.
Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.
Change-Id: I3d12882239e0bb66e11d3fb5ec952cc474be4f0a
Colin Cross [Tue, 27 Mar 2012 17:29:34 +0000 (10:29 -0700)]
Merge "move hardware feature definitions"
Jean-Baptiste Queru [Tue, 27 Mar 2012 17:19:41 +0000 (10:19 -0700)]
Scott Main [Tue, 27 Mar 2012 17:10:40 +0000 (10:10 -0700)]
am
15df921b: am
dde474b6: am
33666ade: docs: re-add android design icon, which had been removed from original location
* commit '
15df921b8dd257dac828ea0f9c280a7d18da37ac':
Scott Main [Tue, 27 Mar 2012 17:10:35 +0000 (10:10 -0700)]
am
c07c8d05: am
0701c756: am
33666ade: docs: re-add android design icon, which had been removed from original location
* commit '
c07c8d05910f3ceea4095d7d1ceb0fd7031aa021':
docs: re-add android design icon, which had been removed from original location
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
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:11:09 +0000 (08:11 -0700)]
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:08:41 +0000 (08:08 -0700)]
Jean-Baptiste Queru [Tue, 27 Mar 2012 15:07:09 +0000 (08:07 -0700)]
Jean-Baptiste Queru [Tue, 27 Mar 2012 14:37:56 +0000 (07:37 -0700)]
Merge "Fix build"
Glenn Kasten [Tue, 27 Mar 2012 02:15:25 +0000 (19:15 -0700)]
Fix build
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
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."
Colin Cross [Mon, 26 Mar 2012 23:25:49 +0000 (16:25 -0700)]
move hardware feature definitions
Move the hardware feature xml files from frameworks/base/data/etc
to frameworks/native/data/etc.
Change-Id: Ie9a9d82a0af120f8c7f580c710e3e464461ea586
Scott Main [Mon, 26 Mar 2012 21:54:08 +0000 (14:54 -0700)]
am
dde474b6: am
33666ade: docs: re-add android design icon, which had been removed from original location
* commit '
dde474b61822bc867ece1310125343f9937d384f':
Scott Main [Mon, 26 Mar 2012 21:32:23 +0000 (14:32 -0700)]
am
0701c756: am
33666ade: docs: re-add android design icon, which had been removed from original location
* commit '
0701c756bc81d17cb5b0a8646d22fb1969f6bd77':
docs: re-add android design icon, which had been removed from original location
Scott Main [Mon, 26 Mar 2012 21:30:00 +0000 (14:30 -0700)]
am
33666ade: docs: re-add android design icon, which had been removed from original location
* commit '
33666ade7a13f2c466346b05b2a7dd1f0f80cb43':
docs: re-add android design icon, which had been removed from original location
Scott Main [Mon, 26 Mar 2012 21:29:21 +0000 (14:29 -0700)]
am
33666ade: docs: re-add android design icon, which had been removed from original location
* commit '
33666ade7a13f2c466346b05b2a7dd1f0f80cb43':
docs: re-add android design icon, which had been removed from original location
Scott Main [Mon, 26 Mar 2012 20:24:14 +0000 (13:24 -0700)]
docs: re-add android design icon, which had been removed from original location
Change-Id: I30f3a38ab3e80e78595e28c46815874e4a84f2ed
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 04:57:33 +0000 (21:57 -0700)]
audio configuration file path change because it is relocated
o related-to-bug:
6214141
Change-Id: I27f50dad2cbc72390f828ba539317df1cf4b1189
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 04:52:33 +0000 (21:52 -0700)]
SDK atree: support HOST_OUT location.
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
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"