Raphael Moll
f515ad2797
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
2012-03-27 17:55:44 -07:00
Raphael Moll
d0bcf3869e
am 2696eb6d
: am 3b1ebe7d
: Merge "SDK atree: support HOST_OUT location."
...
* commit '2696eb6d11759e8a0cd839e9f10c90e38efea21a':
SDK atree: support HOST_OUT location.
2012-03-27 17:55:43 -07:00
Raphael Moll
b6addfb250
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
2012-03-27 17:53:32 -07:00
Raphael Moll
2696eb6d11
am 3b1ebe7d
: Merge "SDK atree: support HOST_OUT location."
...
* commit '3b1ebe7dc291175886f21ffbbccdb98b560efabf':
SDK atree: support HOST_OUT location.
2012-03-27 17:53:32 -07:00
Dima Zavin
8f4c3116b2
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>
2012-03-27 17:30:26 -07:00
Marius Renn
e455a972be
Merge "Multi-Project Commit: Move of filterfw out of system/media (3 of 7)"
2012-03-27 16:29:47 -07:00
Raphael Moll
a8dd58a8a6
Merge "Allow make 3.82 to be used under Cygwin 1.7"
2012-03-27 16:16:45 -07:00
Raphael Moll
4c45699015
Allow make 3.82 to be used under Cygwin 1.7
...
(Manual merge of 76bf62d75e
)
Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
2012-03-27 14:35:34 -07:00
Raphael Moll
3b1ebe7dc2
Merge "SDK atree: support HOST_OUT location."
2012-03-27 11:40:47 -07:00
Marius Renn
fe97fe9e9f
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
2012-03-27 10:46:13 -07:00
Colin Cross
361655591d
Merge "move hardware feature definitions"
2012-03-27 10:29:34 -07:00
Jean-Baptiste Queru
6217aa862d
am 3eb3d2e3
: (-s ours) am acd30108
: am d17c8977
: am 0b6a436f
: Merge "Fix build"
...
* commit '3eb3d2e31afcfca6d0cc54a1f60807da50e97965':
Fix build
2012-03-27 10:19:41 -07:00
Scott Main
aa01d1abef
am 15df921b
: am dde474b6
: am 33666ade
: docs: re-add android design icon, which had been removed from original location
...
* commit '15df921b8dd257dac828ea0f9c280a7d18da37ac':
2012-03-27 10:10:40 -07:00
Scott Main
b8faa7adcc
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
2012-03-27 10:10:35 -07:00
The Android Open Source Project
3bdeec4c65
am 6dbd73d8
: am 6aa8411f
: Reconcile with ics-mr1-release
...
* commit '6dbd73d8ddfcb07c4d0221b6da7335236e7aa632':
2012-03-27 09:58:53 -07:00
The Android Open Source Project
703eb6883c
am c8b1ca18
: am 6e271c76
: Reconcile with ics-mr1-release
...
* commit 'c8b1ca18c7bdf3e71f2bcd6d49ba3e1b2b817d43':
IMM76D
IMM76C
2012-03-27 09:58:52 -07:00
Jean-Baptiste Queru
3eb3d2e31a
am acd30108
: am d17c8977
: am 0b6a436f
: Merge "Fix build"
...
* commit 'acd3010843b4e646ac53685054d82ad7bd88893c':
Fix build
2012-03-27 08:11:09 -07:00
Jean-Baptiste Queru
acd3010843
am d17c8977
: am 0b6a436f
: Merge "Fix build"
...
* commit 'd17c89776e71f61852ac6ec3a75859a832cf1ba6':
Fix build
2012-03-27 08:08:41 -07:00
Jean-Baptiste Queru
d17c89776e
am 0b6a436f
: Merge "Fix build"
...
* commit '0b6a436f09f10e358c64ee977c8322b3a76fd977':
Fix build
2012-03-27 08:07:09 -07:00
Jean-Baptiste Queru
0b6a436f09
Merge "Fix build"
2012-03-27 07:37:58 -07:00
Glenn Kasten
f396f56817
Fix build
...
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
2012-03-27 07:24:24 -07:00
Glenn Kasten
bf6b3be4ea
Merge "mv wilhelm"
2012-03-26 17:54:22 -07:00
Glenn Kasten
d905491b09
mv wilhelm
...
Change-Id: I3c1573a3dcb0567cf330fe06b3ae70b3b8f66978
2012-03-26 17:50:44 -07:00
Stephen Hines
fa85ccdd67
Merge "Skip host system directories in Clang include path."
2012-03-26 17:44:29 -07:00
Colin Cross
97e023c6f2
move hardware feature definitions
...
Move the hardware feature xml files from frameworks/base/data/etc
to frameworks/native/data/etc.
Change-Id: Ie9a9d82a0af120f8c7f580c710e3e464461ea586
2012-03-26 16:25:49 -07:00
Scott Main
15df921b8d
am dde474b6
: am 33666ade
: docs: re-add android design icon, which had been removed from original location
...
* commit 'dde474b61822bc867ece1310125343f9937d384f':
2012-03-26 14:54:08 -07:00
Scott Main
c07c8d0591
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
2012-03-26 14:32:23 -07:00
Scott Main
dde474b618
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
2012-03-26 14:30:00 -07:00
Scott Main
0701c756bc
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
2012-03-26 14:29:21 -07:00
Scott Main
33666ade7a
docs: re-add android design icon, which had been removed from original location
...
Change-Id: I30f3a38ab3e80e78595e28c46815874e4a84f2ed
2012-03-26 13:24:14 -07:00
Kenny Root
9bf081e910
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
2012-03-26 12:39:25 -07:00
The Android Open Source Project
6dbd73d8dd
am 6aa8411f
: Reconcile with ics-mr1-release
...
* commit '6aa8411f2f1258cecd4c1fb593195568d08fef18':
2012-03-26 10:21:29 -07:00
The Android Open Source Project
6aa8411f2f
Reconcile with ics-mr1-release
...
Change-Id: I9d8982c6fae0eb770c95f3b480bc6be0976c11b2
2012-03-26 10:18:02 -07:00
The Android Open Source Project
c8b1ca18c7
am 6e271c76
: Reconcile with ics-mr1-release
...
* commit '6e271c76b6906da529804c3672115a9a88fd8e30':
IMM76D
IMM76C
2012-03-26 09:49:11 -07:00
The Android Open Source Project
6e271c76b6
Reconcile with ics-mr1-release
...
Change-Id: I9be3678a1dc959923c5eb572e2b6f8243c446157
2012-03-26 09:47:10 -07:00
Evgeniy Stepanov
55daae9688
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
2012-03-26 14:22:07 +04:00
James Dong
98f7c37601
Merge "Added /frameworks/av/include to the default include search path"
2012-03-25 16:40:57 -07:00
The Android Automerger
0db00f2ebf
IMM76D
2012-03-25 12:34:33 -07:00
James Dong
e7b0dbbf23
audio configuration file path change because it is relocated
...
o related-to-bug: 6214141
Change-Id: I27f50dad2cbc72390f828ba539317df1cf4b1189
2012-03-23 21:58:34 -07:00
James Dong
c49ee7139f
Added /frameworks/av/include to the default include search path
...
o related-to-bug: 6214141
Change-Id: I90de0563298fd9146ac823926426d1cffd815c2d
2012-03-23 18:47:56 -07:00
Brian Swetland
ee7cd7ea25
Merge "Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK"
2012-03-23 18:26:31 -07:00
Brian Swetland
7a5960555b
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
2012-03-23 16:04:13 -07:00
The Android Automerger
b9624520b4
IMM76C
2012-03-23 14:38:56 -07:00
Mathias Agopian
ee6bddc308
move ndk headers to frameworks/native
...
Change-Id: Ie92ca68bb9f99b2d5a1dbdfc9e57f3f986265386
2012-03-23 14:23:41 -07:00
Mike Lockwood
4ff8608a6a
Merge "Add build.prop to factory ramdisk"
2012-03-23 12:58:30 -07:00
Nick Sanders
8f8f0d494e
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>
2012-03-23 10:51:32 -07:00
Raphael Moll
a3f122abb9
Fix build: Revert "SDK: Enable monitor in sdk product."
...
This reverts commit 0022a035d6
.
2012-03-23 10:45:20 -07:00
James Dong
49cc9bacbf
Merge "Fix missing xml configuration files for sdk builds"
2012-03-23 09:20:58 -07:00
Raphael Moll
2596df4d6b
Merge "SDK: Enable monitor in sdk product."
2012-03-23 09:16:04 -07:00
Stephen Hines
e3a8b62d79
Merge "Make sure compiler flags also pick up correct toolchain."
2012-03-23 05:33:17 -07:00