Raphael Moll
fa6183c396
SDK: update product sdk.mk
...
The target/product/sdk.mk was split out of build.git.
Now this moves a few dependencies that were listed into the sdk.git
version of this file by mistake. Also sort the entries to be more
readable.
Change-Id: I652bca2b0322e9e8efd4bf2d5d9fcfd6c86d9c6c
2012-04-24 16:30:39 -07:00
Xavier Ducrohet
4da8c59102
am d77109de: (-s ours) am 53e3c7d8: am 805b1690: Move support library to r8. do not merge.
...
* commit 'd77109def0b7b7fe3fadaca9bdadd19f01356535':
2012-04-24 15:55:17 -07:00
Xavier Ducrohet
923feb2132
am 5e40f4e2: (-s ours) am 42cbe355: am 805b1690: Move support library to r8. do not merge.
...
* commit '5e40f4e2dfbfdddccc40e538f9eae1737883a3e5':
2012-04-24 15:55:16 -07:00
Raphael Moll
cf41a76a32
am 931eb3a4: am 497c9183: am 6a04b5bb: Merge "Support for Windows SDK pre-requisite module list."
...
* commit '931eb3a4005cb8419d7fbc85217ea8a074f39388':
Support for Windows SDK pre-requisite module list.
2012-04-24 15:54:41 -07:00
Robert Ly
6db39f75e3
am 4b8b7526: am 41ab7fd7: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit '4b8b75264ebbedf80e94d489ad3b591f230283ef':
2012-04-24 15:19:24 -07:00
Robert Ly
b6a5c7dadc
am 13a08689: am f6199950: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit '13a086893acdc35ea75802271bbb9bb7a3693a18':
2012-04-24 15:19:23 -07:00
Raphael Moll
184eca2208
am 56b07781: am a5965405: am 186f007a: Merge "Split build/targets/product/sdk.mk"
...
* commit '56b077812c0f38d3bace893639a882c7807b040b':
Split build/targets/product/sdk.mk
2012-04-24 15:18:50 -07:00
Andrew Hsieh
47c3434ebd
am c7d65053: am 9de85641: am bdd8dd7d: Merge "Fixed compilation error #include <android/*h>"
...
* commit 'c7d6505358925308c706be7b84764b392f19b8dd':
Fixed compilation error #include <android/*h>
2012-04-24 14:27:23 -07:00
Xavier Ducrohet
d77109def0
am 53e3c7d8: am 805b1690: Move support library to r8. do not merge.
...
* commit '53e3c7d833045f56624e09c4cf1ff4650e1ba6fe':
2012-04-24 14:26:07 -07:00
Xavier Ducrohet
42b5d6609d
am bf4cbbe4: (-s ours) am 805b1690: (-s ours) Move support library to r8. do not merge.
...
* commit 'bf4cbbe4c6c252d483f194d5efbf33270f1c6bea':
Move support library to r8. do not merge.
2012-04-24 14:25:49 -07:00
Xavier Ducrohet
5e40f4e2df
am 42cbe355: am 805b1690: Move support library to r8. do not merge.
...
* commit '42cbe3559b59483383e66f4bff95a2c073da835d':
Move support library to r8. do not merge.
2012-04-24 14:24:07 -07:00
Xavier Ducrohet
bf4cbbe4c6
am 805b1690: (-s ours) Move support library to r8. do not merge.
...
* commit '805b1690679072a6295ff073d4b233e069d8b49b':
Move support library to r8. do not merge.
2012-04-24 14:22:23 -07:00
Xavier Ducrohet
53e3c7d833
am 805b1690: Move support library to r8. do not merge.
...
* commit '805b1690679072a6295ff073d4b233e069d8b49b':
Move support library to r8. do not merge.
2012-04-24 14:22:18 -07:00
Xavier Ducrohet
42cbe3559b
am 805b1690: Move support library to r8. do not merge.
...
* commit '805b1690679072a6295ff073d4b233e069d8b49b':
Move support library to r8. do not merge.
2012-04-24 14:21:33 -07:00
Xavier Ducrohet
805b169067
Move support library to r8. do not merge.
...
Change-Id: I27a9242ff4a7d60d64d16d10c06b5aff324f559e
2012-04-24 14:18:57 -07:00
Scott Main
7f7d029b04
am 96e958ef: am 7b797e3b: am 1583b7c6: Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
...
* commit '96e958ef28ce52034764571a8490a4c7c86175b7':
2012-04-24 13:57:27 -07:00
Scott Main
686a128e3c
am 8637322b: am 452f9d66: am 1583b7c6: Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
...
* commit '8637322b12682f41e27e39016e4bc378bc3ff45a':
2012-04-24 13:57:22 -07:00
Scott Main
d08254c07f
am c180eacc: am dc8be81a: am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1
...
* commit 'c180eaccf0ff0fb001158d29d94ac60707719e67':
2012-04-24 13:57:22 -07:00
Scott Main
c4730632cd
am c1855ef3: am fe90e4b1: am ff329d74: Merge "Rename the activity lifecycle sample\'s directory" into ics-mr1
...
* commit 'c1855ef3221fbc6c5b4543aeb826adc9fe83bae7':
2012-04-24 13:57:21 -07:00
Scott Main
b405f58158
am f9715d56: am 11f9ad8c: am ba1636e4: Add new sample for 101 class on fragments.
...
* commit 'f9715d5654114ec78c3249406d9ecdb9b26e2c24':
2012-04-24 13:57:19 -07:00
Scott Main
d890524c3b
am 8fe69d78: am 934e8508: am ba1636e4: Add new sample for 101 class on fragments.
...
* commit '8fe69d78bb20061ea6121c329c4c5e162fba08cd':
2012-04-24 13:57:18 -07:00
The Android Automerger
ebeca628a1
merge in jb-release history after reset to master
2012-04-24 07:00:35 -07:00
Gilles Debunne
a11d0eb32e
Merge "Fixed the XMLAdapters example"
2012-04-23 15:52:48 -07:00
Raphael Moll
931eb3a400
am 497c9183: am 6a04b5bb: Merge "Support for Windows SDK pre-requisite module list."
...
* commit '497c91834be1be005add05c0be0770b6440970f6':
Support for Windows SDK pre-requisite module list.
2012-04-23 15:49:22 -07:00
Raphael Moll
497c91834b
am 6a04b5bb: Merge "Support for Windows SDK pre-requisite module list."
...
* commit '6a04b5bb4e1655c274cc0f2b3d5e4954c1911792':
Support for Windows SDK pre-requisite module list.
2012-04-23 15:45:33 -07:00
Raphael Moll
6a04b5bb4e
Merge "Support for Windows SDK pre-requisite module list."
2012-04-23 14:26:53 -07:00
Raphael Moll
3fb225fbfd
Support for Windows SDK pre-requisite module list.
...
Requires sdk.git change I08fc98f2e1
Change-Id: I7388d7292d175ceac221ce6790655b37f85e8a32
2012-04-23 13:16:16 -07:00
Robert Ly
4b8b75264e
am 41ab7fd7: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit '41ab7fd7ae04a87a9e3ab9dae292a92df6125385':
2012-04-23 10:44:57 -07:00
Robert Ly
9642d03bda
am 3fd0c48b: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit '3fd0c48b8e0f1297dee8ffa6103fd19ebe03da82':
adding media effects sample to sdk
2012-04-23 10:44:42 -07:00
Robert Ly
13a086893a
am f6199950: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit 'f6199950068eda60c47d07d1e41b588c8fd729a4':
adding media effects sample to sdk
2012-04-23 10:43:12 -07:00
Robert Ly
41ab7fd7ae
am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit '018c9eeb8e05e4dd6965655d9f120b595efcd758':
adding media effects sample to sdk
2012-04-23 10:41:40 -07:00
Robert Ly
f619995006
am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit '018c9eeb8e05e4dd6965655d9f120b595efcd758':
adding media effects sample to sdk
2012-04-23 10:41:26 -07:00
Robert Ly
3fd0c48b8e
am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
...
* commit '018c9eeb8e05e4dd6965655d9f120b595efcd758':
adding media effects sample to sdk
2012-04-23 10:41:00 -07:00
Robert Ly
018c9eeb8e
Merge "adding media effects sample to sdk" into ics-mr1
2012-04-23 10:38:30 -07:00
Raphael Moll
56b077812c
am a5965405: am 186f007a: Merge "Split build/targets/product/sdk.mk"
...
* commit 'a596540506a8cd3d4ea780f48e8a9306d4481476':
Split build/targets/product/sdk.mk
2012-04-23 10:15:57 -07:00
Raphael Moll
a596540506
am 186f007a: Merge "Split build/targets/product/sdk.mk"
...
* commit '186f007a741bebdc5ad364df9eda1a9b383e2e15':
Split build/targets/product/sdk.mk
2012-04-23 10:11:32 -07:00
Raphael Moll
186f007a74
Merge "Split build/targets/product/sdk.mk"
2012-04-23 09:48:51 -07:00
The Android Automerger
62bad7555e
merge in jb-release history after reset to master
2012-04-23 07:00:31 -07:00
Xavier Ducrohet
ad3600bb6e
Merge "Add .classpath/.project/readme to gridlayout support package."
2012-04-20 17:02:54 -07:00
Xavier Ducrohet
8957faa8d0
Add .classpath/.project/readme to gridlayout support package.
...
Change-Id: I1f8a08a8f21572fe011964c230a6d45d5ac4b530
2012-04-20 17:02:10 -07:00
Svetoslav Ganov
a185badacb
Fixing the build
...
Change-Id: Iece94781e42cf2e9e0b0d8e447c0754c8bb17003
2012-04-20 16:41:47 -07:00
Raphael Moll
01d30e1a87
Split build/targets/product/sdk.mk
...
Change-Id: I6bbc6644a1dbf19ac768c2ea65d0e383b5dd23ef
2012-04-20 14:19:51 -07:00
Alex Sakhartchouk
58808efa0c
Merge "Renderscript is deprecated. Removing from the sdk."
2012-04-20 08:57:37 -07:00
Andrew Hsieh
c7d6505358
am 9de85641: am bdd8dd7d: Merge "Fixed compilation error #include <android/*h>"
...
* commit '9de856419244f1b89b1a9c9d153771dd8e0aa277':
Fixed compilation error #include <android/*h>
2012-04-20 01:20:59 -07:00
Andrew Hsieh
9de8564192
am bdd8dd7d: Merge "Fixed compilation error #include <android/*h>"
...
* commit 'bdd8dd7d1fa6fa2f791e4e85e924333add90bb58':
Fixed compilation error #include <android/*h>
2012-04-20 01:18:01 -07:00
Andrew Hsieh
bdd8dd7d1f
Merge "Fixed compilation error #include <android/*h>"
2012-04-20 00:52:04 -07:00
Andrew Hsieh
d0e65433d0
Fixed compilation error #include <android/*h>
...
Fixed compilation error when header in #include <android/*h> is
included alone.
Fix for rect.h already exists in $ANDROID/frameworks/native/include/android
Change-Id: I7c49e044507581c5ad591f26f99cda6870b411c5
2012-04-20 15:50:10 +08:00
Scott Main
b9f2743062
am ab57af2f: am 1583b7c6: Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
...
* commit 'ab57af2f90565b25703dad9055fa8a2937af50dc':
Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
2012-04-19 16:56:15 -07:00
Scott Main
96e958ef28
am 7b797e3b: am 1583b7c6: Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
...
* commit '7b797e3bb56d6491bcc8682bddee1ab7b3e9a917':
2012-04-19 16:55:58 -07:00
Scott Main
8637322b12
am 452f9d66: am 1583b7c6: Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
...
* commit '452f9d66039c88f3bd2b132e84fb30b9bc158665':
Delete the fragment-UI sample in favor of the FragmentBasics sample for the 101 training class on fragments
2012-04-19 16:55:28 -07:00
