Commit Graph

6125 Commits

Author SHA1 Message Date
David Turner
cb802ae3d9 am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
* commit '6d70e8c39ec00488ce8acb94d39a77072d9ef465':
  Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-06-07 13:21:44 -07:00
Xavier Ducrohet
733342c712 am 76fb8500: am 80f84422: Add v13 to the compatibility package.
* commit '76fb8500d32e0d9a64b2d00522237d6d8f7a71e9':
  Add v13 to the compatibility package.
2011-06-07 10:58:00 -07:00
Xavier Ducrohet
76fb8500d3 am 80f84422: Add v13 to the compatibility package.
* commit '80f844229137cb0d78689ea61aea37da4c770c8c':
  Add v13 to the compatibility package.
2011-06-07 10:48:13 -07:00
Xavier Ducrohet
80f8442291 Add v13 to the compatibility package.
Also remove ApiDemos from the package and instead
add each library-specific sample app to each v##
folder.

Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381
2011-06-06 19:21:45 -07:00
David 'Digit' Turner
b257bb8ab4 am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
* commit 'e9c7386b0506f7c2f0bc258e3a899fcbe64adc3e':
  ndk: x86: Sanitize platform headers and libraries.
2011-06-06 17:30:49 -07:00
Dianne Hackborn
b36c8d68a3 am 0a9365f8: am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
* commit '0a9365f82530e63334e023b605f71968b48ce91c':
  Update pager demos to match new v4 ViewPager API.
2011-06-06 15:18:59 -07:00
Dianne Hackborn
0a9365f825 am 7ffb7d4b: Update pager demos to match new v4 ViewPager API.
* commit '7ffb7d4b2face7d2ce5cee82c92ec36fd0ba2932':
  Update pager demos to match new v4 ViewPager API.
2011-06-06 15:12:15 -07:00
Dianne Hackborn
7ffb7d4b2f Update pager demos to match new v4 ViewPager API.
Change-Id: I3b0f3382d56b477868b5a5fbf5af22fa83c3e06a
2011-06-06 15:01:45 -07:00
Dianne Hackborn
b6991d5cf1 am a6cadd62: am 47f569e4: Lost and found.
* commit 'a6cadd6244b4c0045ccb571881af982267b4ee9c':
  Lost and found.
2011-06-03 13:33:06 -07:00
Dianne Hackborn
a6cadd6244 am 47f569e4: Lost and found.
* commit '47f569e460adaef04b75174706b7c95471567ca8':
  Lost and found.
2011-06-03 13:17:32 -07:00
Dianne Hackborn
47f569e460 Lost and found.
Change-Id: I3aa4824e2c2157be715d93b698963c54dd98e099
2011-06-03 12:31:09 -07:00
Andy Stadler
14eda7256c am dfb979cd: am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
* commit 'dfb979cd631ef552b627a94a6e88eec6a2db655a':
  DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 10:33:09 -07:00
Andy Stadler
dfb979cd63 am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
* commit '7e408e8be4cd546206b45c51fa41cc09939dbe33':
  DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 10:28:42 -07:00
Andy Stadler
7e408e8be4 Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2 2011-06-03 10:24:20 -07:00
Dianne Hackborn
6faeacbbc5 am 068fa0c3: am 72d2e5c1: New demos for the v13 support library.
* commit '068fa0c33bf92ca63a07a93f09e98324c9443709':
  New demos for the v13 support library.
2011-06-02 19:49:40 -07:00
Dianne Hackborn
068fa0c33b am 72d2e5c1: New demos for the v13 support library.
* commit '72d2e5c1b9bbd96a38035781790ca14dd59b15b8':
  New demos for the v13 support library.
2011-06-02 19:48:21 -07:00
Dianne Hackborn
72d2e5c1b9 New demos for the v13 support library.
Change-Id: I79a727f987d3b21274e1f9ee6359caa2231c258b
2011-06-02 19:44:57 -07:00
Andy Stadler
547494ef8a DO NOT MERGE Replacement sample code for DevicePolicyManager api.
* UI is organized into multiple screens to make it easier to understand
* More feedback about local vs global (aggregate) policies
* Uses preference fragments for modern appearance

Backport of: I075161d389942786e6c95483becbff7ebe847078

Change-Id: Ie88c1577b2ebae124615cc4b45968851cf11187e
2011-06-02 16:39:17 -07:00
Dianne Hackborn
faf6dcd6cd am 94703eef: am 10c33528: Extract support lib samples out of ApiDemos and in to their own app.
* commit '94703eef4ce1a5dcfd8ed1a001a41374ec51f94a':
  Extract support lib samples out of ApiDemos and in to their own app.
2011-05-31 10:54:18 -07:00
Dianne Hackborn
94703eef4c am 10c33528: Extract support lib samples out of ApiDemos and in to their own app.
* commit '10c33528e033643099783a5bc4eedb4b8a1e9a0e':
  Extract support lib samples out of ApiDemos and in to their own app.
2011-05-31 10:51:48 -07:00
David Turner
6d70e8c39e am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon fold
* commit 'bf483268fc2651ea926217851ceea0329e0bb476':
  Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-05-31 08:03:53 -07:00
David Turner
bf483268fc Merge "Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder." 2011-05-30 08:18:32 -07:00
Amit Feller
624176d51a Emulators's GLES 2.0 translator implementation
This is the GLESv2 on top of openGL implementation on the host
most of this change is moving code which is necessary by both
GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
GLcommon folder.

GLESv2Imp - includes GLES 2.0 entry points implementation

Change-Id: I934fb963478a7f596d824612f847a5aa77d2ed9d
2011-05-30 11:06:24 +03:00
David 'Digit' Turner
91641c03b0 am c1b7604a: am 18fc9b3e: Merge "ndk: Update libc.a to Gingerbread version."
* commit 'c1b7604a096ca32513b04c322fce1a0c550de099':
  ndk: Update libc.a to Gingerbread version.
2011-05-29 08:59:31 -07:00
Dianne Hackborn
10c33528e0 Extract support lib samples out of ApiDemos and in to their own app.
Change-Id: I2ca344e5f1b44c4825de938c9a4f9375a523ede5
2011-05-27 18:40:15 -07:00
David 'Digit' Turner
e9c7386b05 am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."
* commit 'e011bed42965ee0488e11b537a4705c262140c3f':
  ndk: x86: Sanitize platform headers and libraries.
2011-05-27 11:19:17 -07:00
David 'Digit' Turner
e011bed429 Merge "ndk: x86: Sanitize platform headers and libraries." 2011-05-27 10:26:04 -07:00
David 'Digit' Turner
3e1498c4c4 ndk: x86: Sanitize platform headers and libraries.
This change sanitizes the x86-specific platform headers and libraries.
It does two things:

- Remove the stuff under android-3/arch-x86

- Update the content of android-9/arch-x86 from a recent AOSP
  full_x86-eng build (see caveats below).

Some files appear to move because they didn't change (e.g. kernel headers).

This change was generated by following these steps:

1/ Build full_x86-eng from the AOSP tree

2/ From $ANDROID_ROOT/ndk, run:

   build/tools/dev-system-import.sh --direct --arch=x86 9

3/ Under $ANDROID_ROOT/development/ndk, do:

   git rm -r android-3/arch-x86
   git add android-9/arch-x86
   git checkout -- android-9/include
   git ls-files -o | xargs rm
   git commit

IMPORTANT:
   The AOSP tip-of-tree used to generate these files
   includes post-Gingerbread changes !!

   The final version of the android-9/arch-x86 files will have to
   be generated from the gingerbread branch after we back-port all
   x86-support changes to it.

   These binaries are thus not final, but can be used to generate
   working experimental NDK packages, including prebuilt GNU libstdc++
   and STLport binaries that implement -fstack-protector correctly.

Change-Id: I260896185a098b9b356bd26f492692e4a4f66f8f
2011-05-27 06:14:16 +02:00
David 'Digit' Turner
c1b7604a09 am 18fc9b3e: Merge "ndk: Update libc.a to Gingerbread version."
* commit '18fc9b3eca4ca8e7435b6e679a249449f6fa739b':
  ndk: Update libc.a to Gingerbread version.
2011-05-24 02:58:56 -07:00
David 'Digit' Turner
18fc9b3eca Merge "ndk: Update libc.a to Gingerbread version." 2011-05-24 02:21:36 -07:00
David 'Digit' Turner
509176259d ndk: Update libc.a to Gingerbread version.
This updates the static C library version provided with
the NDK to the version from the AOSP gingerbread-release
branch, more specifically using the platform/bionic.git SHA1 of:

    3f14ff34dfbd00fcffb18b10a1a3e17e2cc5ebdf

This file is only used to rebuild a gdbserver binary. This version
contains changes necessary to fix gdbserver crashing issues on
certain Honeycomb devices.

You will need to rebuild the NDK gdbserver binary after this patch
is submitted (see build/tools/build-gdbserver.sh --help).

Change-Id: Iab7ff707a9bdbdca0d0fd017178e25da9d48e43d
2011-05-24 03:56:38 +02:00
Dianne Hackborn
339a6666bf am c7ec100c: am 193d98ec: Add new API demo for -swNNNdp resource qualifier.
* commit 'c7ec100ccb5266a3c480eb2563a511b86d106d10':
  Add new API demo for -swNNNdp resource qualifier.
2011-05-19 19:34:15 -07:00
Dianne Hackborn
c7ec100ccb am 193d98ec: Add new API demo for -swNNNdp resource qualifier.
* commit '193d98ec183f4a3e137b8d0c5e20529819e1eef2':
  Add new API demo for -swNNNdp resource qualifier.
2011-05-19 19:30:28 -07:00
Dianne Hackborn
193d98ec18 Add new API demo for -swNNNdp resource qualifier.
Also clean up the demo for the w/h qualifiers to use numbers
that are the same as what we will be recommending.

Change-Id: I87ed35d8dfcb41985e19f450f7853f883effd207
2011-05-19 18:23:29 -07:00
Xavier Ducrohet
5b67110a7c am ed708223: am 7748c429: Updated revision for the compatibility library.
* commit 'ed7082230109e2592e6a3f87d733505bdb95abb7':
  Updated revision for the compatibility library.
2011-05-18 17:04:21 -07:00
Xavier Ducrohet
ed70822301 am 7748c429: Updated revision for the compatibility library.
* commit '7748c429c95cb88ac943fb2843d7834974696454':
  Updated revision for the compatibility library.
2011-05-18 17:01:57 -07:00
Robert Greenwalt
4a76d154e4 am 82cdc8cc: Merge "Fix Development app to use netd for routes" into honeycomb-LTE
* commit '82cdc8cc426fa73b49412245b1c826d4acd29140':
  Fix Development app to use netd for routes
2011-05-18 16:31:01 -07:00
Robert Greenwalt
82cdc8cc42 Merge "Fix Development app to use netd for routes" into honeycomb-LTE 2011-05-18 15:29:42 -07:00
Xavier Ducrohet
7748c429c9 Updated revision for the compatibility library.
Change-Id: I217fd11dc2458490e6981e9f614ce5770ba329c1
2011-05-18 13:36:36 -07:00
David Turner
d143387d72 am 1c53e616: am fd6ed4dd: Merge "adding functionality to get the local name of an object from it\'s local name"
* commit '1c53e61689094f088a07b6fb3cb634eda1833f05':
  adding functionality to get the local name of an object from it's local name
2011-05-18 07:42:00 -07:00
David Turner
1c53e61689 am fd6ed4dd: Merge "adding functionality to get the local name of an object from it\'s local name"
* commit 'fd6ed4dd3167517c926b0af4fdc183d7f015b9fe':
  adding functionality to get the local name of an object from it's local name
2011-05-18 07:29:33 -07:00
David Turner
fd6ed4dd31 Merge "adding functionality to get the local name of an object from it's local name" 2011-05-18 06:52:22 -07:00
David Turner
a76ded7112 am 7e026547: am 83b55247: Merge "this checkin supports windows OS in all Translator libs"
* commit '7e0265477a936ff562dc8cab84a3b24bde267799':
  this checkin supports windows OS in all Translator libs
2011-05-18 03:22:51 -07:00
David Turner
7e0265477a am 83b55247: Merge "this checkin supports windows OS in all Translator libs"
* commit '83b552470ee9d1d5bd51cd531b00b35cbeb7b289':
  this checkin supports windows OS in all Translator libs
2011-05-18 03:15:52 -07:00
David Turner
83b552470e Merge "this checkin supports windows OS in all Translator libs" 2011-05-18 02:33:59 -07:00
Amit Feller
f0b7c2e4f9 this checkin supports windows OS in all Translator libs
Note: this is a re-submit of Ie5111d9c435b64d205b140a79863c0273742ee7f,
fixed to avoid breaking the Mac build.

Change-Id: Ib534063d3f403d33d162956bf510baf9689a246a
2011-05-17 21:28:17 +02:00
David 'Digit' Turner
8fc94823cf am 42a6c754: am 3a38c110: Merge "Fix mac build"
* commit '42a6c75463a3b4590dbc9a3483222f3478342367':
  Fix mac build
2011-05-17 12:21:29 -07:00
David 'Digit' Turner
42a6c75463 am 3a38c110: Merge "Fix mac build"
* commit '3a38c110a970c443c09df6a529a78f5b02a870dc':
  Fix mac build
2011-05-17 12:18:07 -07:00
Raphael Moll
08382e1e2c am ed78d63d: am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs""
* commit 'ed78d63de23730be2a85b7a55b5646b7dc4b7057':
  Revert "this checkin supports windows OS in all Translator libs"
2011-05-17 12:11:42 -07:00
Raphael Moll
ed78d63de2 am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs""
* commit '3fe7791ca18012b69f4663bf69901dd302f2d87f':
  Revert "this checkin supports windows OS in all Translator libs"
2011-05-17 12:09:24 -07:00