Glenn Kasten
fefc17ff59
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
2012-03-14 15:30:37 -07:00
Andreas Huber
84a5e9dd87
Merge "Make sure to copy codec setup files to their proper filesystem location on the emulator"
2012-03-14 08:15:18 -07:00
Ying Wang
bf69aa32c9
Fix tests build.
...
Use the conditional only after the tests build variant is phased out.
Change-Id: Ide691700dda4bbf56c6f81f923d1b8c5eb196b85
2012-03-13 19:49:59 -07:00
Ying Wang
30e8093f5f
Merge "Add build goal "tests"."
2012-03-13 19:13:19 -07:00
Ying Wang
160b670f4a
Add build goal "tests".
...
Bug: 5368571
The phony build goal "tests" will eventually replace the build variant
tests.
Change-Id: Ia656f2cf2260feeaa8fa32e9221b7f9ce0990262
2012-03-13 19:12:21 -07:00
The Android Automerger
3ca86b2abd
IMM72B
2012-03-13 17:16:36 -07:00
Romain Guy
aaf01f48ee
Make adbs work again on Darwin x86.
...
We don't support building on Darwin PPC so let's always assume x86.
Change-Id: I079a4040f1c0a144d4cdd1e2b3d2a183c00bf7b0
2012-03-13 16:57:08 -07:00
Andrew Hsieh
cd1b924e37
Merge "Point to new linux prebuilt toolchain for SDK build"
2012-03-13 15:48:21 -07:00
Ying Wang
bdbbd2062c
Merge "Remove system partition files from the test zip file."
2012-03-13 13:00:46 -07:00
Ying Wang
c5f049799c
Remove system partition files from the test zip file.
...
Bug: 6157562
Change-Id: I581c6db7d47b42617f8ef6097ccd0aae52c7e1b4
2012-03-13 11:22:04 -07:00
Andreas Huber
8fd1541c81
Make sure to copy codec setup files to their proper filesystem location on the emulator
...
Change-Id: I97b6944646fcabc754526ef88f7fdd63d0d1da0a
2012-03-13 09:01:51 -07:00
Andrew Hsieh
0e63fd37dd
Point to new linux prebuilt toolchain for SDK build
...
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
2012-03-13 02:17:35 -07:00
Svetoslav Ganov
49932f1edb
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
2012-03-12 19:56:05 -07:00
The Android Automerger
f44b3505ad
IMM72
2012-03-12 19:36:17 -07:00
The Android Automerger
ca97d052d7
merge in ics-mr1-release history after reset to ics-mr1
2012-03-12 19:30:56 -07:00
Ying Wang
7013298265
Merge "Fix build caused by 168380"
2012-03-12 12:12:38 -07:00
Keun young Park
519316e568
Fix build caused by 168380
...
Change-Id: Iebda5669f48fe505146b8f2f8b35d06621d4b0e6
2012-03-12 12:10:42 -07:00
Keun young Park
26ca833d66
Merge "changes to add pdk1 / pdk2 build for PDK build - additional files will be added to pdk/build Bug: 6079146"
2012-03-12 11:57:39 -07:00
Keun young Park
7fc7aad152
changes to add pdk1 / pdk2 build for PDK build
...
- additional files will be added to pdk/build
Bug: 6079146
Change-Id: Ieb5fcab8002193250d770b923f60ec7333ce84e5
2012-03-12 11:49:34 -07:00
The Android Automerger
031e57b381
second try
2012-03-11 00:58:08 -08:00
The Android Automerger
c3afa8fe03
IMM68C
2012-03-10 09:10:29 -08:00
The Android Automerger
4ea508be53
IMM70
2012-03-10 09:08:53 -08:00
The Android Automerger
eda3c63afd
merge in ics-mr1-release history after reset to ics-mr1
2012-03-10 09:06:03 -08:00
The Android Automerger
3a81843786
IMM62B
2012-03-09 19:28:10 -08:00
The Android Automerger
187d092908
IMM69
2012-03-09 19:25:45 -08:00
The Android Automerger
8015f31215
merge in ics-mr1-release history after reset to ics-mr1
2012-03-09 19:22:16 -08:00
Jean-Michel Trivi
43ba688fed
Include the downmix effect in the platform
...
Change-Id: Ifc05bb7edc06994623848adf568524a98f0f316a
2012-03-09 18:52:00 -08:00
The Android Automerger
03fb636144
IMM68B
2012-03-09 09:59:12 -08:00
Chih-Chung Chang
742a194438
Merge "Remove Camera package (it's merged into Gallery package)."
2012-03-09 01:20:58 -08:00
The Android Automerger
15ad8cccaa
IMM68
2012-03-08 20:49:08 -08:00
The Android Automerger
ec1f6f1259
merge in ics-mr1-release history after reset to ics-mr1
2012-03-08 20:42:40 -08:00
Mathias Agopian
a1af38d9b3
Merge "update include paths to new location"
2012-03-08 14:45:34 -08:00
Mathias Agopian
a7c674b141
Merge "add frameworks/native include paths"
2012-03-08 14:45:28 -08:00
Chih-Chung Chang
a125a3b8a0
Remove Camera package (it's merged into Gallery package).
...
Change-Id: I6808438055d256bd5e2ac607ccafe5c9e5e9311a
2012-03-08 20:06:26 +08:00
Scott Anderson
1a5fc95a4a
Rename help function in envsetup.sh to be hmm
...
Bash has a built-in command "help" that is useful for getting
help on bash commands without wading through the bash man page
(e.g. "help test" will give you the syntax for those "if [ ]"
expressions). Overwriting a built-in with a convenience function
is not good.
The function "hmm" was added recently that serves much the same
purpose as help. It seems like a good idea to remove the new
"hmm" command and rename "help" to be "hmm" so we no longer
overwrite the built-in.
Change-Id: I2079b3e6a10715956ec077d31e817a939c6ee4a0
Signed-off-by: Scott Anderson <saa@android.com>
2012-03-07 17:15:06 -08:00
Roman Nurik
1576159807
am 8caffd62
: am 0d1630a3
: am d9ca90b4
: Add SDK template and assets for Android Design
...
* commit '8caffd622d3ee322040baa9f1a70eedfb74c11f0':
2012-03-07 17:05:22 -08:00
Roman Nurik
f84c92e861
am 52f25665
: am a23a3d83
: am d9ca90b4
: Add SDK template and assets for Android Design
...
* commit '52f256655855e0a03653a007cb4279eb1c152c5e':
Add SDK template and assets for Android Design
2012-03-07 17:05:15 -08:00
Dirk Dougherty
f9e5ac6f6e
am d53d3d80
: am 74f072a4
: am 7d114b19
: doc change: assets for play
...
* commit 'd53d3d8027be650397c000bdfa093c761c3fb893':
2012-03-07 16:48:24 -08:00
Dirk Dougherty
9c6abfb757
am 460eebe3
: am 79736c72
: am 7d114b19
: doc change: assets for play
...
* commit '460eebe3b7161cc3d74eba0ab6381dd4894bfffc':
doc change: assets for play
2012-03-07 16:48:23 -08:00
Ying Wang
11a7e126e5
Merge "Update llvm-rs-cc build to use unified headers in all cases."
2012-03-07 16:00:27 -08:00
Stephen Hines
5a4eb5f0f8
Update llvm-rs-cc build to use unified headers in all cases.
...
Change-Id: I66a2cc5f762b7d170f4bfc6c88f8c7df11be4f4b
2012-03-07 15:59:05 -08:00
Roman Nurik
8caffd622d
am 0d1630a3
: am d9ca90b4
: Add SDK template and assets for Android Design
...
* commit '0d1630a34dc6ecf59c67ee4a51569fe7e933649d':
2012-03-06 14:54:16 -08:00
Roman Nurik
52f2566558
am a23a3d83
: am d9ca90b4
: Add SDK template and assets for Android Design
...
* commit 'a23a3d83143911358dd917a9f7f4cd9b097e4af8':
Add SDK template and assets for Android Design
2012-03-06 14:43:02 -08:00
Roman Nurik
ba86e31428
am d9ca90b4
: Add SDK template and assets for Android Design
...
* commit 'd9ca90b4b9bd631329e6241b1ac4824ad0821639':
Add SDK template and assets for Android Design
2012-03-06 14:41:47 -08:00
Roman Nurik
0d1630a34d
am d9ca90b4
: Add SDK template and assets for Android Design
...
* commit 'd9ca90b4b9bd631329e6241b1ac4824ad0821639':
Add SDK template and assets for Android Design
2012-03-06 14:41:33 -08:00
Roman Nurik
a23a3d8314
am d9ca90b4
: Add SDK template and assets for Android Design
...
* commit 'd9ca90b4b9bd631329e6241b1ac4824ad0821639':
Add SDK template and assets for Android Design
2012-03-06 14:41:13 -08:00
Roman Nurik
d9ca90b4b9
Add SDK template and assets for Android Design
...
Change-Id: Id7a953bf59e5e05242c46cdfb2b425e80424fc2f
2012-03-06 14:31:15 -08:00
Dirk Dougherty
d53d3d8027
am 74f072a4
: am 7d114b19
: doc change: assets for play
...
* commit '74f072a447bb4c348dbb87b30bc47a164f33b4de':
2012-03-05 22:56:21 -08:00
Dirk Dougherty
460eebe3b7
am 79736c72
: am 7d114b19
: doc change: assets for play
...
* commit '79736c72c219b283c38282ef6d42b662195c126d':
doc change: assets for play
2012-03-05 22:55:15 -08:00
Dirk Dougherty
0dadb804dc
am 7d114b19
: doc change: assets for play
...
* commit '7d114b195d2224ba8c6f8e156467b969317e0bf9':
doc change: assets for play
2012-03-05 21:39:25 -08:00