LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,056 Commits 2 Branches 0 Tags
f8e828d2d0cf1598968b8c93dc8627c9a8a99c7c
Commit Graph

10056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael Moll
add6f71e75 am d42bec86: (-s ours) am 8ff88c36: am af574136: Support lib: use /samples directory. do not merge. 
* commit 'd42bec86ddf296f2d9b4df059dbaaeceea7a8d3d':
 2012-03-12 13:02:33 -07:00
Raphael Moll
90ea721e46 am bc86d238: (-s ours) am a4c2cb77: am af574136: Support lib: use /samples directory. do not merge. 
* commit 'bc86d23849ed54e0c934765eecd4d88bcb059a60':
  Support lib: use /samples directory. do not merge.
 2012-03-12 13:02:33 -07:00
Raphael Moll
d42bec86dd am 8ff88c36: am af574136: Support lib: use /samples directory. do not merge. 
* commit '8ff88c3672461260d1c3b255714d701aec1bfac2':
 2012-03-12 12:32:24 -07:00
Raphael Moll
bc86d23849 am a4c2cb77: am af574136: Support lib: use /samples directory. do not merge. 
* commit 'a4c2cb77b51bc2b2faa615e8a6bfa20f24998269':
  Support lib: use /samples directory. do not merge.
 2012-03-12 12:32:04 -07:00
Raphael Moll
a4c2cb77b5 am af574136: Support lib: use /samples directory. do not merge. 
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
  Support lib: use /samples directory. do not merge.
 2012-03-12 12:30:20 -07:00
Raphael Moll
8ff88c3672 am af574136: Support lib: use /samples directory. do not merge. 
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
  Support lib: use /samples directory. do not merge.
 2012-03-12 12:29:59 -07:00
Raphael Moll
6f721123f0 am af574136: Support lib: use /samples directory. do not merge. 
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
  Support lib: use /samples directory. do not merge.
 2012-03-12 12:29:47 -07:00
Raphael Moll
af57413607 Support lib: use /samples directory. do not merge. 
This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.

Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/

(Cherry-pick from 913d903aa2)

Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
 2012-03-12 12:27:02 -07:00
Raphael Moll
913d903aa2 Support lib: use /samples directory. 
This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.

Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/

Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
 2012-03-12 11:33:18 -07:00
The Android Automerger
e5c42ba2e0 merge in jb-release history after reset to master 2012-03-12 07:00:42 -07:00
The Android Automerger
5396ffc7a9 merge in ics-mr1-release history after reset to ics-mr1 2012-03-10 09:06:40 -08:00
The Android Automerger
1f0ab0347f merge in ics-mr1-release history after reset to ics-mr1 2012-03-09 19:23:06 -08:00
Siva Velusamy
fd4a73989f Fix # of arguments to startActivity 
Change-Id: I01daa8efe56d6a8ba0d35f63290d50281d4723eb
 2012-03-09 14:35:44 -08:00
Ying Wang
438a4112b3 Merge "Add framework/native to fix build." 2012-03-09 10:22:13 -08:00
Ying Wang
06f3f54fc0 Add framework/native to fix build. 
No framework/native is split out from framework/base.

Change-Id: I3b596a98feee01f433fa0e88d81d780315a3ebb8
 2012-03-09 10:04:22 -08:00
Ed Heyl
35c941e726 Merge "Minor makefile tweak to compile with elfutils-0.138" 2012-03-09 09:48:10 -08:00
Mathias Agopian
d069948a49 update Eclipse include paths 
Change-Id: Ia73ff3cc256ac0daaf3095441f595e271bc6c44e
 2012-03-08 21:05:49 -08:00
Mathias Agopian
cc3332aac7 remove dependency on apparently uneeded libs. might fix sdk build 
Change-Id: I78cb49456ccf8bc6df3ebdd76ae63e0b0b6d7e4b
 2012-03-08 21:02:36 -08:00
The Android Automerger
3d17b9896f merge in ics-mr1-release history after reset to ics-mr1 2012-03-08 20:43:39 -08:00
Ben Cheng
e35bfe51a1 Minor makefile tweak to compile with elfutils-0.138 
Explicitly specify that this module is only built on linux-x86 and
darwin-x86

Change-Id: I2dba02b25c655af114417fc222a697e4d5294602
 2012-03-08 16:14:35 -08:00
Megha Joshi
b1a2cd42eb am 4b46b075: am ca2728fe: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '4b46b0756f1a296f2e14c5ae8d6c701ef5cbf51e':
 2012-03-08 12:29:13 -08:00
Megha Joshi
7abd0794f4 am 8288333b: am 3174fec7: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '8288333b0a7d7741631066d11e65dd01d43c9a77':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
 2012-03-08 12:26:38 -08:00
Megha Joshi
4b46b0756f am ca2728fe: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit 'ca2728fe1f4a2592d5cb780ccf8cc756494a8752':
 2012-03-08 12:25:32 -08:00
Megha Joshi
92039ecc6a am 5989a5de: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '5989a5de5b69c5d0211004786f52044382a751cf':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
 2012-03-08 12:24:17 -08:00
Megha Joshi
8288333b0a am 3174fec7: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '3174fec75f73b92fdaac2958e3cf0c4b6be6a562':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
 2012-03-08 12:24:14 -08:00
Megha Joshi
5989a5de5b am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
 2012-03-08 12:22:34 -08:00
Megha Joshi
ca2728fe1f am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
 2012-03-08 12:22:03 -08:00
Megha Joshi
3174fec75f am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 
* commit '27a6a0f0a5dc74886a7f0c42d6300a2cb92f6da2':
  Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
 2012-03-08 12:21:52 -08:00
Megha Joshi
27a6a0f0a5 Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1 2012-03-08 12:20:00 -08:00
Brian Muramatsu
83f4573b4a Fixes for runtest 
- No need to include cts/CtsBuild.mk, because that is included by the
  core build system.

- Include the tradefed-prebuilt.jar on the classpath when running
  host side tests.

- Update some of test_defs that have changed. Remove suites that
  have been deleted.

Change-Id: Ie2845db7f209ad4ccb881d2ad47b9415c9f518a4
 2012-03-08 11:50:17 -08:00
Derek Sollenberger
a96af3f6f8 am 3565ea1a: am 89e98da5: am a848b972: am 89b7a104: Merge "Add missing includes for threads.h" 
* commit '3565ea1a6ecccc59839d883ee74fc4ba83f4ab02':
  Add missing includes for threads.h
 2012-03-08 11:34:13 -08:00
Derek Sollenberger
3565ea1a6e am 89e98da5: am a848b972: am 89b7a104: Merge "Add missing includes for threads.h" 
* commit '89e98da5ac2596bd532bd6209ee3bda5a3842577':
  Add missing includes for threads.h
 2012-03-08 11:32:04 -08:00
Derek Sollenberger
89e98da5ac am a848b972: am 89b7a104: Merge "Add missing includes for threads.h" 
* commit 'a848b97255a15d2ac75db1e367cc60ff46b77e20':
  Add missing includes for threads.h
 2012-03-08 11:30:09 -08:00
Derek Sollenberger
a848b97255 am 89b7a104: Merge "Add missing includes for threads.h" 
* commit '89b7a104d41c1ecbc1319a3d47199d40d56ebc96':
  Add missing includes for threads.h
 2012-03-08 11:28:31 -08:00
Derek Sollenberger
89b7a104d4 Merge "Add missing includes for threads.h" 2012-03-08 08:46:53 -08:00
Xavier Ducrohet
45678a32d4 am e3f5f497: (-s ours) am 83bf8d16: am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit 'e3f5f497b240f90bf3455e031dc5cc230d12fcd2':
 2012-03-08 08:08:50 -08:00
Xavier Ducrohet
be3a667619 am abcaa390: (-s ours) am 624c4870: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit 'abcaa39070a6d02ccdaceae11b856545df959a23':
 2012-03-08 08:08:49 -08:00
Xavier Ducrohet
42b46a0044 am 3a499b0f: (-s ours) am 8438213c: am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit '3a499b0fede7508c09dcedb16ea35ede3ade5d03':
  Prepare for doc package update in rev 2. do not merge.
 2012-03-08 08:08:48 -08:00
Xavier Ducrohet
e18f7959dc am 1754063f: (-s ours) am 198705d1: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit '1754063ff021083adeed4c446f6df285cb018e06':
  Add a prebuilt of the gridlayout support library. do not merge
 2012-03-08 08:08:48 -08:00
The Android Automerger
cc1bd46bcb merge in jb-release history after reset to master 2012-03-08 07:00:16 -08:00
Xavier Ducrohet
e3f5f497b2 am 83bf8d16: am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit '83bf8d1673800954c8e7bb474a6a6b4519d33745':
 2012-03-07 20:10:30 -08:00
Xavier Ducrohet
abcaa39070 am 624c4870: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit '624c487060ff8b20992a738bd8d6ff04ef247fa3':
 2012-03-07 20:10:29 -08:00
Xavier Ducrohet
3a499b0fed am 8438213c: am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit '8438213c2fc9aff20c3244dca5a1b30fadcb5785':
  Prepare for doc package update in rev 2. do not merge.
 2012-03-07 20:09:33 -08:00
Xavier Ducrohet
9dbfcfbb91 am 9138af34: (-s ours) am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit '9138af34a57f77f90877f579209eaae9e1d75c59':
  Prepare for doc package update in rev 2. do not merge.
 2012-03-07 20:09:32 -08:00
Xavier Ducrohet
1754063ff0 am 198705d1: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit '198705d1ab7f818b146c0c6e0d85f80e4b658e06':
  Add a prebuilt of the gridlayout support library. do not merge
 2012-03-07 20:09:32 -08:00
Xavier Ducrohet
7705e94f94 am a2482e09: (-s ours) am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit 'a2482e0933b469de70091186546f1402c2d3338c':
  Add a prebuilt of the gridlayout support library. do not merge
 2012-03-07 20:09:31 -08:00
Xavier Ducrohet
8438213c2f am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit '88d972501ae16197ebabb2f053a69856bca410d9':
  Prepare for doc package update in rev 2. do not merge.
 2012-03-07 20:07:39 -08:00
Xavier Ducrohet
198705d1ab am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
  Add a prebuilt of the gridlayout support library. do not merge
 2012-03-07 20:07:38 -08:00
Xavier Ducrohet
9138af34a5 am 88d97250: Prepare for doc package update in rev 2. do not merge. 
* commit '88d972501ae16197ebabb2f053a69856bca410d9':
  Prepare for doc package update in rev 2. do not merge.
 2012-03-07 20:07:21 -08:00
Xavier Ducrohet
a2482e0933 am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge 
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
  Add a prebuilt of the gridlayout support library. do not merge
 2012-03-07 20:07:20 -08:00