Commit Graph

4370 Commits

Author SHA1 Message Date
Kenny Root
e575be05fd am 12c86756: Merge "Add OBB usage example" into gingerbread
Merge commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d' into gingerbread-plus-aosp

* commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d':
  Add OBB usage example
2010-09-30 10:09:11 -07:00
Xavier Ducrohet
92d47e4ef6 am 682ec293: Split the tools component from sdk.atree
Merge commit '682ec293359cf4ac8c61df25bb05519b604b17eb' into gingerbread-plus-aosp

* commit '682ec293359cf4ac8c61df25bb05519b604b17eb':
  Split the tools component from sdk.atree
2010-09-30 08:52:23 -07:00
Kenny Root
12c86756b9 Merge "Add OBB usage example" into gingerbread 2010-09-29 17:19:14 -07:00
Kenny Root
b9e80e74e2 Add OBB usage example
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
2010-09-29 16:18:08 -07:00
Eric Fischer
2ec45a5e5a am f4578730: Genericize strings with SD card references.
Merge commit 'f4578730bf95574f417fc2cee979bdc980cd02a8' into gingerbread-plus-aosp

* commit 'f4578730bf95574f417fc2cee979bdc980cd02a8':
  Genericize strings with SD card references.
2010-09-29 12:49:20 -07:00
Eric Fischer
f4578730bf Genericize strings with SD card references.
Change-Id: Ife7f7178b7ba11650bb81a6afc61e70e4b8a7b4f
2010-09-29 10:56:20 -07:00
Xavier Ducrohet
682ec29335 Split the tools component from sdk.atree
This is now in sdk/build/tools.atree.

Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
2010-09-28 08:37:24 -07:00
Xavier Ducrohet
daa454cb3b am 64e53fe5: Merge "Move adb to the platform-tools."
Merge commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b' into gingerbread-plus-aosp

* commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b':
  Move adb to the platform-tools.
2010-09-27 16:44:55 -07:00
Raphael Moll
c0a2e0fc63 am 2f613967: Move adb to the platform-tools (windows SDK part).
Merge commit '2f613967a0c4a579370ff498c8461abee4978fc7' into gingerbread-plus-aosp

* commit '2f613967a0c4a579370ff498c8461abee4978fc7':
  Move adb to the platform-tools (windows SDK part).
2010-09-27 16:44:40 -07:00
Xavier Ducrohet
64e53fe5dd Merge "Move adb to the platform-tools." 2010-09-27 16:24:25 -07:00
Raphael Moll
2f613967a0 Move adb to the platform-tools (windows SDK part).
This is the Win SDK counterpart to Change I4c2a11c1.

Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc
2010-09-27 16:20:07 -07:00
Xavier Ducrohet
6a8e50f695 Move adb to the platform-tools.
Also fixed the packaging of hierarchyViewer in the SDK

Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
2010-09-27 13:58:45 -07:00
Jean-Baptiste Queru
29fd635bfd am 7159b406: reconcile froyo-release into gingerbread
Merge commit '7159b406efb7533f022cbe0bd2d855eb6a52cfe1' into gingerbread-plus-aosp

* commit '7159b406efb7533f022cbe0bd2d855eb6a52cfe1':
  Explicitly enable backup by default in SDK builds
2010-09-26 17:39:26 -07:00
Jean-Baptiste Queru
7159b406ef reconcile froyo-release into gingerbread
Change-Id: I0cd475594cd7697ee681bfc7eb76d61bec236417
2010-09-26 17:28:54 -07:00
David 'Digit' Turner
fe13c7616d am be572466: Merge "Update prebuilt library test." into gingerbread
Merge commit 'be57246603d3f6286dc6763a089daf5c1387de55' into gingerbread-plus-aosp

* commit 'be57246603d3f6286dc6763a089daf5c1387de55':
  Update prebuilt library test.
2010-09-24 01:15:20 -07:00
David 'Digit' Turner
be57246603 Merge "Update prebuilt library test." into gingerbread 2010-09-24 01:12:54 -07:00
Dianne Hackborn
ebb0b03e17 am d424b8d9: Prepare for a new IActivityController method.
Merge commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82' into gingerbread-plus-aosp

* commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82':
  Prepare for a new IActivityController method.
2010-09-23 16:02:22 -07:00
Dianne Hackborn
d424b8d9cc Prepare for a new IActivityController method.
Change-Id: I30823fe0c06aef35a2773760ec938e7979cd1037
2010-09-23 14:51:56 -07:00
David 'Digit' Turner
9de6872b4c am 1f0003f5: Merge "Unify NDK platform headers." into gingerbread
Merge commit '1f0003f57da3f9805af9ab883d5255be58cf4439' into gingerbread-plus-aosp

* commit '1f0003f57da3f9805af9ab883d5255be58cf4439':
  Unify NDK platform headers.
2010-09-23 08:25:36 -07:00
David 'Digit' Turner
1f0003f57d Merge "Unify NDK platform headers." into gingerbread 2010-09-23 07:35:51 -07:00
David 'Digit' Turner
7012117d4a Unify NDK platform headers.
This commit removes duplication of system headers per platform, i.e. remove
copies of common headers like <stdlib.h> from arch-arm/usr/include and arch-x86/usr/include
and move them to a common include directory. More specifically:

- common headers:        android-N/arch-A/usr/include --> android-N/include
- arch-specific headers: android-N/arch-A/usr-include --> android-N/arch-A/include
- arch-specific libs:    android-N/arch-A/usr/lib     --> android-N/arch-A/lib

Change-Id: Ifdba5038d108901931f3e3a7c14ebe6270d2d276

NOTE: This also contains careful separation of API-level-specific headers.
      For example, platforms/android-5/include/pthread.h contains new function
      declarations that are not available when using platforms/android-3/include/pthread.h

NOTE: The NDK's build-platforms.sh script has been updated to understand the new
      layout. This change in develeopment/ndk does not change the layout of
      platform files under $NDK/platforms after build-platforms.sh is called.
2010-09-22 18:04:36 +02:00
David 'Digit' Turner
2068cc393b Update prebuilt library test.
This is to reflect the simplification in prebuilt support.
1/ LOCAL_SRC_FILES is relative to LOCAL_PATH, like with other module types
2/ no need for LOCAL_PREBUILTS

Change-Id: If7302fe355cb25a446e31c20015098db75c00c02
2010-09-22 15:11:57 +02:00
Brett Chabot
3211cc0abf am 14282f97: Merge "Change hosttestlib to use ddm-prebuilt." into gingerbread
Merge commit '14282f9796f888c3388d25a878b625fd76840212' into gingerbread-plus-aosp

* commit '14282f9796f888c3388d25a878b625fd76840212':
  Change hosttestlib to use ddm-prebuilt.
2010-09-21 14:33:11 -07:00
Andy Stadler
18618e5505 am 9b2d35f0: DO NOT MERGE Classpath cleanup in libcore
Merge commit '9b2d35f0a81cb0483337ab0a776c5e9287e84dbf' into gingerbread-plus-aosp

* commit '9b2d35f0a81cb0483337ab0a776c5e9287e84dbf':
  DO NOT MERGE Classpath cleanup in libcore
2010-09-21 14:28:58 -07:00
Brett Chabot
14282f9796 Merge "Change hosttestlib to use ddm-prebuilt." into gingerbread 2010-09-21 14:28:26 -07:00
Andy Stadler
9b2d35f0a8 DO NOT MERGE Classpath cleanup in libcore
* libcore/security no longer exists
* many other dirs under libcore had no java code

Change-Id: I1fcfda6ce769e0d9fbd4893c46bbded586c78251
2010-09-21 14:07:22 -07:00
Brett Chabot
fb0b7c06a7 Change hosttestlib to use ddm-prebuilt.
Change-Id: I9124f34e6ba5559afc9a4bf9b5c70690385db11a
2010-09-21 11:44:23 -07:00
Andy Stadler
66ce420c32 resolved conflicts for merge of 97903767 to gingerbread-plus-aosp
Change-Id: Ic71831342d8e7d548b3d082a97486b40e0636994
2010-09-17 19:16:26 -07:00
Andy Stadler
97903767d3 Cleanups for eclipse classpath DO NOT MERGE
Change-Id: Ic4ab8299eb2e17f01346887d22620c0f23399328
2010-09-17 15:59:20 -07:00
Xavier Ducrohet
591b5edf25 am d5964750: Package Proguard with the SDK.
Merge commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f' into gingerbread-plus-aosp

* commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f':
  Package Proguard with the SDK.
2010-09-17 14:31:47 -07:00
Xavier Ducrohet
d59647505d Package Proguard with the SDK.
Change-Id: Ia3effdf9465edbe55d5a691bf7bad163e95bb625
2010-09-16 15:54:37 -07:00
Jeff Brown
434450f73a am 2405e67f: Merge "Update NDK headers and samples to sync up with looper API changes." into gingerbread
Merge commit '2405e67fad64b62efa71f04aab712fd9d80803df' into gingerbread-plus-aosp

* commit '2405e67fad64b62efa71f04aab712fd9d80803df':
  Update NDK headers and samples to sync up with looper API changes.
2010-09-14 15:30:01 -07:00
Jeff Brown
2405e67fad Merge "Update NDK headers and samples to sync up with looper API changes." into gingerbread 2010-09-14 15:27:41 -07:00
Jeff Brown
9f44e97108 Update NDK headers and samples to sync up with looper API changes.
Change-Id: I7082603bf280888be90dc4df687521aaae9b1d02
2010-09-14 02:02:15 -07:00
Megha Joshi
292096fccd am 3471dafa: am 42d3a4ae: Adding CrossCompatibility sample app.
Merge commit '3471dafa11b721ae4510cb182e3d54033faed12d' into gingerbread-plus-aosp

* commit '3471dafa11b721ae4510cb182e3d54033faed12d':
  Adding CrossCompatibility sample app.
2010-09-13 17:43:01 -07:00
Megha Joshi
3471dafa11 am 42d3a4ae: Adding CrossCompatibility sample app.
Merge commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread

* commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
  Adding CrossCompatibility sample app.
2010-09-13 17:38:43 -07:00
Megha Joshi
42d3a4ae14 Adding CrossCompatibility sample app.
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
2010-09-13 17:00:10 -07:00
Vairavan Srinivasan
3d925ea9e8 am 50d579d0: GlobalTime: Perform Zoom In and Out only after initialization
Merge commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843' into gingerbread-plus-aosp

* commit '50d579d0ec9c9d0bcd3da936af8480808d5e0843':
  GlobalTime: Perform Zoom In and Out only after initialization
2010-09-10 15:41:59 -07:00
Trevor Johns
915bdba9ac am 12d3ad89: am e55fc016: Merge "Use remote_api for shell access on developer.android.com." into froyo
Merge commit '12d3ad89e48e4e95a1ebf78fad1978e9e5e56a3d' into gingerbread-plus-aosp

* commit '12d3ad89e48e4e95a1ebf78fad1978e9e5e56a3d':
  Use remote_api for shell access on developer.android.com.
2010-09-10 12:38:04 -07:00
Trevor Johns
12d3ad89e4 am e55fc016: Merge "Use remote_api for shell access on developer.android.com." into froyo
Merge commit 'e55fc016a6e40edd456c0d240d06689d84a7127b' into gingerbread

* commit 'e55fc016a6e40edd456c0d240d06689d84a7127b':
  Use remote_api for shell access on developer.android.com.
2010-09-10 12:33:57 -07:00
Trevor Johns
e55fc016a6 Merge "Use remote_api for shell access on developer.android.com." into froyo 2010-09-10 12:23:09 -07:00
Trevor Johns
5e100c67f3 Use remote_api for shell access on developer.android.com.
This allows Python shell access on developer.android.com
using the remote_api_shell.py script that's bundled with
the App Engine SDK.

Change-Id: If3c979ccbf885905a9cc3840645dcb6a5a50cfa8
2010-09-10 11:26:50 -07:00
Jeff Brown
2073f44b8f am ff242db8: Merge "Add samples for secure views." into gingerbread
Merge commit 'ff242db8670695e946400d957a82d2933e7e01a1' into gingerbread-plus-aosp

* commit 'ff242db8670695e946400d957a82d2933e7e01a1':
  Add samples for secure views.
2010-09-08 11:57:59 -07:00
Jeff Brown
ff242db867 Merge "Add samples for secure views." into gingerbread 2010-09-08 11:53:13 -07:00
Vairavan Srinivasan
50d579d0ec GlobalTime: Perform Zoom In and Out only after initialization
Invoking zoom on mGLView before initialization causes Null pointer
exception. The usecase is to launch global time and immediately
press key 2 or 8 (just before the globe is seen on display).

Change-Id: I10e7736527a934029364c9c83f147f94574f5488
2010-09-07 19:13:46 -07:00
Dianne Hackborn
eb39544df6 am d3d58cf7: Update to follow ALooper ident change.
Merge commit 'd3d58cf7d3a508bb855c2ad626205ddcbb3bd237' into gingerbread-plus-aosp

* commit 'd3d58cf7d3a508bb855c2ad626205ddcbb3bd237':
  Update to follow ALooper ident change.
2010-09-07 16:36:39 -07:00
Dianne Hackborn
d3d58cf7d3 Update to follow ALooper ident change.
Also the native-activity sample also has some very simple code showing
how to listen to the accelerometer.

Change-Id: I0629b8bc40cddd66233c1675cd5e8b42a9b722d8
2010-09-07 15:47:35 -07:00
Jeff Brown
cf4db94885 Add samples for secure views.
Change-Id: Ibe1e63c87f4c6a715009f7bbcdafa552dc2d937c
2010-09-07 13:04:15 -07:00
Joe Onorato
310187112b am 7d26cd19: Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Merge commit '7d26cd198266cd48cb0a912585419fbe0cc8ed89' into gingerbread-plus-aosp

* commit '7d26cd198266cd48cb0a912585419fbe0cc8ed89':
  Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
2010-09-07 11:39:40 -07:00
Joe Onorato
7d26cd1982 Add an activity to Dev Tools that shows the Configuration and DisplayMetrics.
Change-Id: I6d3a682adccfef99eaa4d01b97091eda68f05cd8
2010-09-07 12:03:48 -04:00