Commit Graph

8682 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
45cb1b0a85 am 376154d4: Merge "Fix Eclipse classpath file for ICS."
* commit '376154d427968e3a43088860fab81d9de5bf7270':
  Fix Eclipse classpath file for ICS.
2012-06-12 07:46:26 -07:00
Jean-Baptiste Queru
376154d427 Merge "Fix Eclipse classpath file for ICS." 2012-06-12 07:31:50 -07:00
Xavier Ducrohet
21f4ca579e am 74ed92d3: Merge "Move emugl system code to development.git"
* commit '74ed92d325ec1eb9287a79fff3ca62c7f0f864f8':
  Move emugl system code to development.git
2012-06-07 12:17:21 -07:00
Xavier Ducrohet
74ed92d325 Merge "Move emugl system code to development.git" 2012-06-07 12:13:23 -07:00
Xavier Ducrohet
e0db6a0c55 am 392863b7: Merge "Remove tab only if tab exists."
* commit '392863b774874dff5ca4df3d336c5d459f014697':
  Remove tab only if tab exists.
2012-06-06 14:50:50 -07:00
Xavier Ducrohet
392863b774 Merge "Remove tab only if tab exists." 2012-06-06 14:44:26 -07:00
Jesse Hall
56513f5ff4 Move emugl system code to development.git
Because of the way the SDK and Android system images are branched,
host code that goes into the SDK tools can't live in the same
repository as code that goes into the system image. This change keeps
the emugl host code in sdk.git/emulator/opengl while moving the emugl
system code to development.git/tools/emulator/opengl.

A few changes were made beyond simply cloning the directories:

(a) Makefiles were modified to only build the relevant components. Not
    doing so would break the build due to having multiple rule
    definitions.

(b) Protocol spec files were moved from the guest encoder directories
    to the host decoder directories. The decoder must support older
    versions of the protocol, but not newer versions, so it makes
    sense to keep the latest version of the protocol spec with the
    decoder.

(c) Along with that, the encoder is now built from checked in
    generated encoder source rather than directly from the protocol
    spec.  The generated code must be updated manually. This makes it
    possible to freeze the system encoder version without freezing the
    host decoder version, and also makes it very obvious when a
    protocol changes is happening that will require special
    backwards-compatibility support in the decoder/renderer.

(d) Host-only and system-only code were removed from the repository
    where they aren't used.

(e) README and DESIGN documents were updated to reflect this split.

No actual source code was changed due to the above.

Change-Id: I2c936101ea0405b372750d36ba0f01e84d719c43
2012-06-06 09:46:29 -07:00
Andrew Hsieh
93122516a7 am c424ad10: Merge "ndk: Remove prebuilt C runtime objects. Add sources instead."
* commit 'c424ad10606977edab8d81a39eca68ddf00ec686':
  ndk: Remove prebuilt C runtime objects. Add sources instead.
2012-06-01 04:02:51 -07:00
Andrew Hsieh
c424ad1060 Merge "ndk: Remove prebuilt C runtime objects. Add sources instead." 2012-06-01 03:51:09 -07:00
David 'Digit' Turner
5e7c4e6a57 ndk: Remove prebuilt C runtime objects. Add sources instead.
This patch removes all prebuilt C runtime object files from
the ndk/platforms/ directory. We replace them with equivalent
assembly sources lifted from the following directories:

  bionic/libc/private/      (for __dso_handle.S and __dso_handle_so.S)
  bionic/libc/arch-$ARCH/   (for all others)

Note: This requires that your NDK's gen-platforms.sh script be
      capable of rebuilding the object files from sources.
      See https://android-review.googlesource.com/36822

The goal here is to make it much easier to update these files,
and track their changes relative to the content of bionic/lib.
For example to fix the following issues in the future:

Change-Id: If4c84e2584b0e58ca3585b034bb8a13a8add8ab9
http://code.google.com/p/android/issues/detail?id=26911
http://code.google.com/p/android/issues/detail?id=23203
2012-05-31 10:58:57 +02:00
Raphael Moll
a8fd9e0a3b am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."
* commit '86ef5ca7e3cd1a3b8cac77aa645217d3fcdccfab':
  SDK: Ability to generate repos in XSD repository-7.
2012-05-30 15:18:28 -07:00
Raphael Moll
86ef5ca7e3 Merge "SDK: Ability to generate repos in XSD repository-7." 2012-05-30 15:00:11 -07:00
Jean-Baptiste Queru
34baff19d8 am 99314f43: Merge "Fix old style edit text drawable display error."
* commit '99314f432e024720ffb88431ca8535cec5e4ff58':
  Fix old style edit text drawable display error.
2012-05-23 15:04:39 -07:00
Jean-Baptiste Queru
99314f432e Merge "Fix old style edit text drawable display error." 2012-05-23 14:58:09 -07:00
Raphael Moll
91ab8ff826 am 69ce67b4: Merge "Fix Mac SDK: sed s/--in-place/-i/"
* commit '69ce67b42dca77762b18c3a1770a6a32e8c51bbf':
  Fix Mac SDK: sed s/--in-place/-i/
2012-05-15 18:38:41 -07:00
Raphael Moll
69ce67b42d Merge "Fix Mac SDK: sed s/--in-place/-i/" 2012-05-15 17:45:52 -07:00
Raphael Moll
877b365e36 Fix Mac SDK: sed s/--in-place/-i/
Change-Id: Idd6481fd86c62596e95647bd3acaedf1a7158640
2012-05-15 17:22:50 -07:00
Raphael Moll
c678e6a535 am d721f0e2: Merge "Fix SDK: don\'t generate empty codename line in source.properties."
* commit 'd721f0e2c2d800743f315e39f29081db6362c850':
  Fix SDK: don't generate empty codename line in source.properties.
2012-05-15 13:35:31 -07:00
Raphael Moll
d721f0e2c2 Merge "Fix SDK: don't generate empty codename line in source.properties." 2012-05-15 13:28:56 -07:00
Raphael Moll
f9f9ea96c1 am 66493c9e: Merge "SDK: don\'t generate empty codename line in source.properties."
* commit '66493c9e6ac3ec87f33347bea745b43b04519bd1':
  SDK: don't generate empty codename line in source.properties.
2012-05-15 13:15:48 -07:00
Raphael Moll
8707207977 Fix SDK: don't generate empty codename line in source.properties.
This fixes commit 41a7acfa6b.

Change-Id: I3cc6ee0efea53fd0469c29fb0ffa87d727b15431
2012-05-15 12:26:37 -07:00
SeongJae Park
b9ca48dc1d Fix old style edit text drawable display error.
[Problem]
LinearLayout5, RelativeLayout2 of ApiDemos has text input field
display error.

[Cause]
They use Holo theme although text input field use old style edit text
drawable as background.

[Solution]
Use default edit text without custom background for RelativeLayout2,
LinearLayout5 sample.

Change-Id: I102bf267119ba0903bd17e898b525af0aa2f0c5d
Signed-off-by: SeongJae Park <sj38.park@gmail.com>
2012-05-16 02:53:26 +09:00
Raphael Moll
66493c9e6a Merge "SDK: don't generate empty codename line in source.properties." 2012-05-15 10:37:04 -07:00
Raphael Moll
41a7acfa6b SDK: don't generate empty codename line in source.properties.
SDK Bug: b/6490860

Change-Id: I1eb7090eedca961a2a71a18e5dcef68e6cbf7163
2012-05-14 21:00:01 -07:00
Raphael Moll
b06504185e SDK: Ability to generate repos in XSD repository-7.
Change-Id: Idc4c75a99625342128e59ea06fe8d30c5b2f56b7
2012-05-10 23:24:19 -07:00
Trevor Johns
ccbf6813f6 am 90e9900c: Merge "Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support"
* commit '90e9900c444dc1270646c6d0190e4e7b48a89665':
  Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support
2012-05-03 19:34:32 -07:00
Trevor Johns
90e9900c44 Merge "Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support" 2012-05-03 18:30:25 -07:00
Andrew Hsieh
7d8febcb1a am 56849da6: Merge "[MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain"
* commit '56849da62cb54b9ea105895b2d65e5f40328fa41':
  [MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain
2012-05-02 20:06:03 -07:00
Andrew Hsieh
56849da62c Merge "[MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain" 2012-05-02 19:32:35 -07:00
Raghu Gandham
ae9a5f960c [MIPS] Import signal.h from bionic. This version fixes the
warning emitted by the toolchain
2012-05-02 18:46:58 -07:00
Kartic Grover
a1843415aa Modified Snake Sample app to run on non-touch devices like Google Tv and also devices with no dpad support
2D canvas DrawVertex to create a vector graphic background
touch & keypad playable
landscape & portrait for all known device sizes.  All measurements in DP and nicely scaling.
using xml drawables to rotate "dpad" arrow

Change-Id: I995acaaf0935c13c03fcbcf974ce5af06f46780e
2012-05-02 09:43:34 -07:00
Trevor Johns
5cee3da134 am b2c1343d: Merge "Changes in some of the Android samples to support Google TV"
* commit 'b2c1343d418a034309bdd14db16bf669de394c98':
  Changes in some of the Android samples to support Google TV
2012-05-01 15:33:10 -07:00
Trevor Johns
b2c1343d41 Merge "Changes in some of the Android samples to support Google TV" 2012-05-01 13:02:01 -07:00
Kartic Grover
08bbdb6b21 Changes in some of the Android samples to support Google TV
Made changes in manifest files for 3 Android samples, namely ActionBarCompat, BackupRestore and CrossCompatibility for supporting Google TV devices. Changes related to making touchscreen support as optional and adding support for large screen devices was added.

Change-Id: Ie49b6fe94d750304b249b154b4bd9dffc3f789ee
2012-04-25 16:52:12 -07:00
Raphael Moll
5b9f9e2852 am 424c95da: Merge "SDK: Update sdk product library dependency list"
* commit '424c95da4b3a413c1dae1c270437001ea203cbf3':
  SDK: Update sdk product library dependency list
2012-04-25 15:57:51 -07:00
Raphael Moll
424c95da4b Merge "SDK: Update sdk product library dependency list" 2012-04-25 15:07:43 -07:00
Raphael Moll
e5a8435b42 am a70fac3d: Merge "SDK: update product sdk.mk"
* commit 'a70fac3d09705d03cf7b2e98340b174424f54b5a':
  SDK: update product sdk.mk
2012-04-25 13:50:26 -07:00
Raphael Moll
a70fac3d09 Merge "SDK: update product sdk.mk" 2012-04-25 10:23:13 -07:00
Raphael Moll
feaa5e8fbe SDK: Update sdk product library dependency list
Change-Id: I4830e7eac1192360a0a9850f763f98063b2c266f
2012-04-24 17:01:20 -07:00
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
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
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
018c9eeb8e Merge "adding media effects sample to sdk" into ics-mr1 2012-04-23 10:38:30 -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
Raphael Moll
01d30e1a87 Split build/targets/product/sdk.mk
Change-Id: I6bbc6644a1dbf19ac768c2ea65d0e383b5dd23ef
2012-04-20 14:19:51 -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