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
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
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
Jean-Michel Trivi
43ba688fed
Include the downmix effect in the platform
...
Change-Id: Ifc05bb7edc06994623848adf568524a98f0f316a
2012-03-09 18:52:00 -08:00
Chih-Chung Chang
742a194438
Merge "Remove Camera package (it's merged into Gallery package)."
2012-03-09 01:20:58 -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
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
79736c72c2
am 7d114b19: doc change: assets for play
...
* commit '7d114b195d2224ba8c6f8e156467b969317e0bf9':
doc change: assets for play
2012-03-05 21:39:25 -08:00
Dirk Dougherty
74f072a447
am 7d114b19: doc change: assets for play
...
* commit '7d114b195d2224ba8c6f8e156467b969317e0bf9':
doc change: assets for play
2012-03-05 21:39:00 -08:00
Dirk Dougherty
7d114b195d
doc change: assets for play
...
Change-Id: I58647fd0059c5de54dd7665527a73f61e0d2dd32
2012-03-05 21:36:28 -08:00
Mathias Agopian
fb956ef9cc
update include paths to new location
...
Change-Id: I13dfa74f35ee778615cdb9459fc2e18bc37d62a1
2012-03-05 18:45:37 -08:00
Mathias Agopian
6d40595e53
Merge "add a name for opengl tests include paths"
2012-03-05 16:08:15 -08:00
Mathias Agopian
bd118e684d
add frameworks/native include paths
...
Change-Id: I1ede8075dc77f77f5a9bc4a53663d4a74842ab36
2012-03-05 16:04:31 -08:00
Mathias Agopian
cdcea7a83d
add a name for opengl tests include paths
...
Change-Id: I4fd30376bcc9549da9391cde99b884eab305d5dd
2012-03-05 16:01:41 -08:00
The Android Open Source Project
5cb1fc0714
am ec3b4b72: am 719c9e02: Reconcile with ics-mr1-release
...
* commit 'ec3b4b725fc176a507e1da5156c4ff70f3cc8395':
2012-03-02 16:48:33 -08:00
The Android Open Source Project
ec3b4b725f
am 719c9e02: Reconcile with ics-mr1-release
...
* commit '719c9e027297693d8874a4c3f8864387b9a93154':
2012-03-02 16:44:17 -08:00
The Android Open Source Project
719c9e0272
Reconcile with ics-mr1-release
...
Change-Id: I2484dad4a2ab183880aeede3685b6e0bae83ab82
2012-03-02 16:41:32 -08:00
The Android Open Source Project
7d0f0b562a
am c8b150cf: am f1b829d1: Reconcile with ics-mr1-release
...
* commit 'c8b150cfc913c1c97e6205c571ef4a3a96fd2dd5':
IMM62
2012-03-02 16:37:54 -08:00
The Android Open Source Project
c8b150cfc9
am f1b829d1: Reconcile with ics-mr1-release
...
* commit 'f1b829d19d71df2228a7af2a253877edeaa0f2f0':
IMM62
2012-03-02 16:35:21 -08:00
The Android Open Source Project
f1b829d19d
Reconcile with ics-mr1-release
...
Change-Id: I7b6a55cf5ad81aa9ddfd4706a4f5998d3153534e
2012-03-02 16:32:48 -08:00
Brian Muramatsu
23bb696870
Merge "Include CTS Build Rules"
2012-03-02 15:13:04 -08:00
Brian Muramatsu
7314933ac7
Include CTS Build Rules
...
Change-Id: Ieacee8ff6215b22222ea9ea6a1e62fce62daad77
2012-03-02 14:37:08 -08:00
Raphael Moll
3ab307a68c
SDK: Also read sdk/build/tools.OS.atree
...
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.
Change-Id: I9a1256548345fb866b0750fce6810913413dd946
2012-03-02 12:40:04 -08:00
The Android Automerger
081c50ffc5
IMM62
2012-03-02 11:55:21 -08:00
The Android Automerger
bcebabb5e8
merge in ics-mr1-release history after reset to ics-mr1
2012-03-02 11:49:21 -08:00
The Android Open Source Project
10cae8ecd8
am 70b0d157: am 0f03bad3: Reconcile with ics-mr1-release
...
* commit '70b0d157985cd47e858ae515f235bac779338440':
2012-03-01 16:46:20 -08:00
The Android Open Source Project
fe7293ff5e
am 440370a6: am 2ab3572b: Reconcile with ics-mr1-release
...
* commit '440370a609a3170af14e9546d42a539206327335':
IMM59
IMM56D
IMM56C
IMM56B
IMM56
2012-03-01 15:51:17 -08:00
The Android Open Source Project
70b0d15798
am 0f03bad3: Reconcile with ics-mr1-release
...
* commit '0f03bad3fe7e82838c3bedf220fcf1c1056f6ffb':
2012-03-01 10:43:33 -08:00
The Android Open Source Project
0f03bad3fe
Reconcile with ics-mr1-release
...
Change-Id: I33df3a369f056bd2369452fd056e0de355e6f9b4
2012-03-01 10:39:57 -08:00
The Android Open Source Project
440370a609
am 2ab3572b: Reconcile with ics-mr1-release
...
* commit '2ab3572ba3431e45b7dbedaa4573b00fa80826b2':
IMM59
IMM56D
IMM56C
IMM56B
IMM56
2012-03-01 10:14:18 -08:00
The Android Open Source Project
2ab3572ba3
Reconcile with ics-mr1-release
...
Change-Id: I1e421d10ac99db335b199dfa0806d7e244d0c1e9
2012-03-01 10:11:36 -08:00