OSDN Git Service

android-x86/build.git
13 years agoMerge "Added webrtc audio processing library"
Eric Laurent [Wed, 13 Jul 2011 20:16:57 +0000 (13:16 -0700)]
Merge "Added webrtc audio processing library"

13 years agoMerge "Append the list of languages to the list of locales"
Jean-Baptiste Queru [Wed, 13 Jul 2011 14:55:01 +0000 (07:55 -0700)]
Merge "Append the list of languages to the list of locales"

13 years agoAdded webrtc audio processing library
Eric Laurent [Wed, 13 Jul 2011 00:18:04 +0000 (17:18 -0700)]
Added webrtc audio processing library

Change-Id: I50d013b4d0de4a3abf3258f713617761bbd01199

13 years agoMerge "Remove the simulator target from all makefiles. Bug: 5010576"
Jeff Brown [Tue, 12 Jul 2011 19:11:36 +0000 (12:11 -0700)]
Merge "Remove the simulator target from all makefiles. Bug: 5010576"

13 years agoRemove the simulator target from all makefiles.
Jeff Brown [Tue, 12 Jul 2011 05:11:46 +0000 (22:11 -0700)]
Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62

13 years agoMerge "Revert "Added webrtc audio processing library""
Eric Laurent [Tue, 12 Jul 2011 02:28:10 +0000 (19:28 -0700)]
Merge "Revert "Added webrtc audio processing library""

13 years agoRevert "Added webrtc audio processing library"
Eric Laurent [Tue, 12 Jul 2011 02:14:11 +0000 (19:14 -0700)]
Revert "Added webrtc audio processing library"

This reverts commit 14052b8db5fbc1da593b0a9b29ebb1a1848232ee

13 years agoMerge "Added webrtc audio processing library"
Eric Laurent [Tue, 12 Jul 2011 01:10:45 +0000 (18:10 -0700)]
Merge "Added webrtc audio processing library"

13 years agoam 7c32eeba: am 040221a9: am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593...
Scott Main [Tue, 12 Jul 2011 00:09:48 +0000 (17:09 -0700)]
am 7c32eeba: am 040221a9: am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2

* commit '7c32eebac5bc5811f95bf2209ad80fcc6ebb550a':
  docs: fix xss vulnerability bug 5008593

13 years agoam 981c1de4: am eb0a62cb: (-s ours) am b399f5e8: Merge "Rename health shared library."
Jaikumar Ganesh [Tue, 12 Jul 2011 00:09:30 +0000 (17:09 -0700)]
am 981c1de4: am eb0a62cb: (-s ours) am b399f5e8: Merge "Rename health shared library."

* commit '981c1de41a731bf7517f4604bfa351993462e986':
  Rename health shared library.

13 years agoMerge "Add PhotoEditor in AOSP builds"
Jean-Baptiste Queru [Mon, 11 Jul 2011 16:49:25 +0000 (09:49 -0700)]
Merge "Add PhotoEditor in AOSP builds"

13 years agoDisable gcc-4.6's Wunused-but-set-variables warning.
Doug Kwan [Sat, 9 Jul 2011 01:47:25 +0000 (18:47 -0700)]
Disable gcc-4.6's Wunused-but-set-variables warning.

Change-Id: Ia02fa536410b9200beca1d9d120ec448c82e5ca8

13 years agoam dcca65cb: am 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
Joe Malin [Sat, 9 Jul 2011 00:53:03 +0000 (17:53 -0700)]
am dcca65cb: am 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page

* commit 'dcca65cb1d1ca1ae108b417ebd7241f397012b45':
  DOC CHANGE: Change GTV icons for home page

13 years agoam 040221a9: am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeyc...
Scott Main [Sat, 9 Jul 2011 00:45:38 +0000 (17:45 -0700)]
am 040221a9: am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2

* commit '040221a9949c9f158cb7fc20b70b065289fcbbb1':
  docs: fix xss vulnerability bug 5008593

13 years agoam 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
Scott Main [Sat, 9 Jul 2011 00:44:08 +0000 (17:44 -0700)]
am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2

* commit '1e03253bf263472ea0028d2518292beaf4cbe01a':
  docs: fix xss vulnerability bug 5008593

13 years agoMerge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
Scott Main [Sat, 9 Jul 2011 00:42:40 +0000 (17:42 -0700)]
Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2

13 years agodocs: fix xss vulnerability
Scott Main [Fri, 8 Jul 2011 23:19:25 +0000 (16:19 -0700)]
docs: fix xss vulnerability
bug 5008593

the fix deletes some code that was originally there to handle side nav
highlighting for inter-doc links. This code is no longer necessary (or at least
should not be) because side nav links should not be inter-doc links, but
should always be to their own document (no two sidenav links should go
to separate sections of the same doc).

Change-Id: If77d6fe869e6a44bae2f194c9de26222e6ad9419

13 years agoAdd PhotoEditor in AOSP builds
Jean-Baptiste Queru [Fri, 8 Jul 2011 23:19:42 +0000 (16:19 -0700)]
Add PhotoEditor in AOSP builds

Change-Id: If0a302701c4b6d2ebfb6b5dd6896d6717411553b

13 years agoam eb0a62cb: (-s ours) am b399f5e8: Merge "Rename health shared library."
Jaikumar Ganesh [Fri, 8 Jul 2011 19:12:14 +0000 (12:12 -0700)]
am eb0a62cb: (-s ours) am b399f5e8: Merge "Rename health shared library."

* commit 'eb0a62cb26d7bed289df823e2d68e422c39b5659':
  Rename health shared library.

13 years agoam b399f5e8: Merge "Rename health shared library."
Jaikumar Ganesh [Fri, 8 Jul 2011 18:34:46 +0000 (11:34 -0700)]
am b399f5e8: Merge "Rename health shared library."

* commit 'b399f5e81e2a644776f163e499df5bd0a38fe272':
  Rename health shared library.

13 years agoMerge "Rename health shared library."
Jaikumar Ganesh [Fri, 8 Jul 2011 18:25:33 +0000 (11:25 -0700)]
Merge "Rename health shared library."

13 years agoRename health shared library.
Jaikumar Ganesh [Fri, 8 Jul 2011 18:20:23 +0000 (11:20 -0700)]
Rename health shared library.

Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9

13 years agoam 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
Joe Malin [Fri, 8 Jul 2011 17:38:37 +0000 (10:38 -0700)]
am 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page

* commit '2c97d30fefed3430daa356418146d2cbb1f23c8f':
  DOC CHANGE: Change GTV icons for home page

13 years agoMerge "Add Bluetooth health to the PRODUCT_PACKAGE."
Jaikumar Ganesh [Fri, 8 Jul 2011 16:40:27 +0000 (09:40 -0700)]
Merge "Add Bluetooth health to the PRODUCT_PACKAGE."

13 years agoam 8cf99f0c: DOC CHANGE: Change GTV icons for home page
Joe Malin [Fri, 8 Jul 2011 16:29:29 +0000 (09:29 -0700)]
am 8cf99f0c: DOC CHANGE: Change GTV icons for home page

* commit '8cf99f0ccee8ecc95183f939d633a514e7eebdfb':
  DOC CHANGE: Change GTV icons for home page

13 years agoAdd Bluetooth health to the PRODUCT_PACKAGE.
Jaikumar Ganesh [Fri, 8 Jul 2011 01:08:15 +0000 (18:08 -0700)]
Add Bluetooth health to the PRODUCT_PACKAGE.

Change-Id: Ifb668f74c09a321eea9d2785f7574cd637aff092

13 years agoMerge "Add VideoEditor to full builds"
Jean-Baptiste Queru [Thu, 7 Jul 2011 22:48:04 +0000 (15:48 -0700)]
Merge "Add VideoEditor to full builds"

13 years agoAdd VideoEditor to full builds
Jean-Baptiste Queru [Thu, 7 Jul 2011 22:30:15 +0000 (15:30 -0700)]
Add VideoEditor to full builds

Change-Id: Iaaecaa24b25c67642197d4926aa7f350991abf60

13 years agoReconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
The Android Open Source Project [Thu, 7 Jul 2011 22:22:25 +0000 (15:22 -0700)]
Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release

Change-Id: I8ea53082a2a9d54a8004ff834d2344b989ca0fbf

13 years agoGRJ90C - a test build
android-merger [Thu, 7 Jul 2011 21:45:05 +0000 (14:45 -0700)]
GRJ90C - a test build

Change-Id: Ieabc475f7e45db1d79a56036fdb377c52bd8f1ac

13 years agoMerge "Prevent "::" in PATH on multiple lunch"
Doug Zongker [Thu, 7 Jul 2011 18:24:41 +0000 (11:24 -0700)]
Merge "Prevent "::" in PATH on multiple lunch"

13 years agoGRJ90B - a test build
android-merger [Thu, 7 Jul 2011 17:40:48 +0000 (10:40 -0700)]
GRJ90B - a test build

Change-Id: I54aefd71dc35381aed8ab1fbf99280d566520c0c

13 years agoMerge "Enable LOCAL_STRIP_MODULE for prebuilt binaries"
Ying Wang [Thu, 7 Jul 2011 16:29:19 +0000 (09:29 -0700)]
Merge "Enable LOCAL_STRIP_MODULE for prebuilt binaries"

13 years agoHLK07
The Android Automerger [Thu, 7 Jul 2011 14:19:53 +0000 (07:19 -0700)]
HLK07

Change-Id: I9442d2198c19df9fadfcb19868cde304c4088444

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 7 Jul 2011 14:19:47 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoEnable LOCAL_STRIP_MODULE for prebuilt binaries
Ji-Hwan Lee [Wed, 6 Jul 2011 18:10:14 +0000 (03:10 +0900)]
Enable LOCAL_STRIP_MODULE for prebuilt binaries

Currently, prebuilt binaries with debug symbols are installed unstripped.

There are only a few of prebuilt shared library (that I'm trying to fix),
so I can do this manually by making intermediate target and applying
TARGET_STRIP, each of them, one by one.

But dynamic_binary.mk has more features than stripping binaries
(like copying unstripped binaries to symbols directory)
and if I do it manually, they will lose all the benefits.

Note that this doesn't change anything when LOCAL_STRIP_MODULE is not set.
I actually tried to force strip every BUILD_PREBUILT'ed modules,
but there were a few problems:

- Some packages are not installed (i.e. not in PRODUCT_PACAKGES)
  but are built (i.e. in ALL_MODULES).  And some of them are built in spite
  that they do not have appropriate prebuilt shared library for TARGET_ARCH.
  Stripping them causes "unknown format".

- Some prebuilt modules set LOCAL_MODULE_CLASS incorrectly.
  Example is default.supp of external/valgrind/main, which should be ETC,
  not SHARED_LIBRARY.

Both are better fixed, but I concluded that it's better to be conservative.

Bug: 4585734
Change-Id: If71723b1d76007d45b02429ea5161a8265dd5b6d

13 years agoSet build id to HTJ85B
The Android Automerger [Thu, 7 Jul 2011 00:45:44 +0000 (17:45 -0700)]
Set build id to HTJ85B

Change-Id: I00c0a1209127ade88bf49bb821234c0da04ca029

13 years agoDOC CHANGE: Change GTV icons for home page
Joe Malin [Fri, 1 Jul 2011 19:51:48 +0000 (12:51 -0700)]
DOC CHANGE: Change GTV icons for home page

Change-Id: If7172345173b165350417ab52f706d6444dc4d96

13 years agoHTK06
The Android Automerger [Wed, 6 Jul 2011 20:01:56 +0000 (13:01 -0700)]
HTK06

Change-Id: I61cda8058f46a955ed7217f90ab5d0601627b300

13 years agoReconcile with gingerbread-release honeycomb-LTE-release
The Android Open Source Project [Wed, 6 Jul 2011 14:35:15 +0000 (07:35 -0700)]
Reconcile with gingerbread-release honeycomb-LTE-release

Change-Id: Ide009ee977f3b2a5344dcb4843a9274380658560

13 years agoHLK06
The Android Automerger [Wed, 6 Jul 2011 14:13:59 +0000 (07:13 -0700)]
HLK06

Change-Id: Id9a931f0e2f1e9d11ee40335c19890206541279a

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 6 Jul 2011 14:13:54 +0000 (07:13 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoRemove vpn from FRAMEWORKS_BASE_SUBDIRS
Ying Wang [Tue, 5 Jul 2011 22:37:22 +0000 (15:37 -0700)]
Remove vpn from FRAMEWORKS_BASE_SUBDIRS

To eliminate build warning.
Reference commit: 44e27b5c74b5f441973561a4f945cb58e0cc45a4
which removed framework/base/vpn.

Change-Id: I539e4bc2a4008c8b9eed74dd53eec1f55db3abe5

13 years agoHLK05
The Android Automerger [Tue, 5 Jul 2011 14:15:28 +0000 (07:15 -0700)]
HLK05

Change-Id: I4c789558d8e510bf250ca5ccbfce292dc39dbd5a

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 5 Jul 2011 14:15:24 +0000 (07:15 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoHLK04
The Android Automerger [Mon, 4 Jul 2011 14:18:52 +0000 (07:18 -0700)]
HLK04

Change-Id: Ib862c2fb576f0ce3becb00a576db2566ec319823

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 4 Jul 2011 14:18:47 +0000 (07:18 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoPrevent "::" in PATH on multiple lunch
Ji-Hwan Lee [Mon, 4 Jul 2011 05:09:47 +0000 (14:09 +0900)]
Prevent "::" in PATH on multiple lunch

Running lunch multiple times results in inserting "::" each time.
"::" is an empty path element, which is treated as a current directory.

Change-Id: I770f4c1f40224ea91fd7989b0ea47d3cd081c24f

13 years agoHLK01B
The Android Automerger [Fri, 1 Jul 2011 22:37:50 +0000 (15:37 -0700)]
HLK01B

Change-Id: I94bde12eeace63caa24bc545d97e8af49a7d53e5

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 1 Jul 2011 22:37:44 +0000 (15:37 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoAdd mobile filter framework java library to core target files.
Eino-Ville Talvala [Wed, 29 Jun 2011 17:03:19 +0000 (10:03 -0700)]
Add mobile filter framework java library to core target files.

Change-Id: Ia4892d8c49be905ec68423224ca44c8558edbdb8

13 years agoRemove obsolete persist.service.adb.enable property from default.prop
Mike Lockwood [Fri, 1 Jul 2011 16:31:47 +0000 (12:31 -0400)]
Remove obsolete persist.service.adb.enable property from default.prop

Change-Id: I59a2da01eddfc1fa775e027a86f7f818a146a6b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
13 years agoHLK01
The Android Automerger [Fri, 1 Jul 2011 14:19:24 +0000 (07:19 -0700)]
HLK01

Change-Id: I3c25b979402a5843c5bcba58336dc0d9a805503c

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 1 Jul 2011 14:19:18 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoHLJ91
The Android Automerger [Thu, 30 Jun 2011 14:19:12 +0000 (07:19 -0700)]
HLJ91

Change-Id: Ib4ae3dd4de51cbc0f736e5db90670bbea9264b7e

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 30 Jun 2011 14:19:06 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoGRJ90
android-merger [Wed, 29 Jun 2011 18:16:15 +0000 (11:16 -0700)]
GRJ90

Change-Id: I76536224052c1e921ac7887bd772bcdf725f36b2

13 years agoHLJ90
The Android Automerger [Wed, 29 Jun 2011 14:18:20 +0000 (07:18 -0700)]
HLJ90

Change-Id: Ic5c6aa3728e51af7fce0ca2d8afcf79bc17dfd80

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 29 Jun 2011 14:18:16 +0000 (07:18 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoHLJ89B
The Android Automerger [Tue, 28 Jun 2011 22:11:24 +0000 (15:11 -0700)]
HLJ89B

Change-Id: I5c5c7e0355a70123aa3a598bf33055b9fdc75cc5

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 28 Jun 2011 22:11:20 +0000 (15:11 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoHLJ89
The Android Automerger [Tue, 28 Jun 2011 14:19:46 +0000 (07:19 -0700)]
HLJ89

Change-Id: I2566542dd48247e7010606b4ba0d6edab81e6c67

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 28 Jun 2011 14:19:38 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoAdd .gnu_debuglink when stripping DSOs.
Evgeniy Stepanov [Tue, 21 Jun 2011 13:08:49 +0000 (17:08 +0400)]
Add .gnu_debuglink when stripping DSOs.

This is used by debug tools to find symbols for the stripped binary.
Adds ~70 bytes to each DSO, ~25000 bytes total, which is about 0.01% of the
system image.

This change only affects -eng and -userdebug builds, and does not affect -user.

Change-Id: I0c92a9e09fbc97184dea66813923568cbcc2a3fe

13 years agoReconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
The Android Open Source Project [Mon, 27 Jun 2011 23:04:37 +0000 (16:04 -0700)]
Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release

Change-Id: I6592f9416213bdf7c4190297b2edf08a5de9ce45

13 years agoam 11e1d5fb: am 6236d356: am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent...
David 'Digit' Turner [Mon, 27 Jun 2011 21:14:33 +0000 (14:14 -0700)]
am 11e1d5fb: am 6236d356: am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"

* commit '11e1d5fb3a33de9c5aad7c21294b8019a0f042b8':
  sdk: provide ABI-dependent atree files

13 years agoHLJ88
The Android Automerger [Mon, 27 Jun 2011 15:17:16 +0000 (08:17 -0700)]
HLJ88

Change-Id: I886289d92b6850bd83c86cd48e182025ab137a0c

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 27 Jun 2011 15:17:08 +0000 (08:17 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoHLJ86
The Android Automerger [Sat, 25 Jun 2011 18:49:31 +0000 (11:49 -0700)]
HLJ86

Change-Id: Ie9edd591b670684c633cabe2c475e7fcccb69e04

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 25 Jun 2011 18:49:26 +0000 (11:49 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoHTJ85
The Android Automerger [Sat, 25 Jun 2011 00:20:42 +0000 (17:20 -0700)]
HTJ85

Change-Id: Id7699e3bfdbc8a67d12f321a996e8eaa23e335ad

13 years agomerge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Sat, 25 Jun 2011 00:20:33 +0000 (17:20 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2

13 years agoGRJ85
android-merger [Fri, 24 Jun 2011 18:18:22 +0000 (11:18 -0700)]
GRJ85

Change-Id: I5f70ae7fcc5f1ff98c050d9e1a3a819fc2acbbfa

13 years agoRevert "resolved conflicts for merge of 972433bd to master"
Jean-Baptiste Queru [Fri, 24 Jun 2011 15:48:31 +0000 (08:48 -0700)]
Revert "resolved conflicts for merge of 972433bd to master"

This reverts commit 5d0ec1aebb952601d98c2dad70ef369f75f2b44a, reversing
changes made to 4839e47309ccefc41d4e7055f701104995472723.

13 years agoReconcile with honeycomb-mr1-release
The Android Open Source Project [Fri, 24 Jun 2011 15:13:19 +0000 (08:13 -0700)]
Reconcile with honeycomb-mr1-release

Change-Id: I200a7f476eaefab1044101fa5d4ab022c332f159

13 years agoReconcile with honeycomb-mr2-release honeycomb-LTE-release
The Android Open Source Project [Fri, 24 Jun 2011 15:08:33 +0000 (08:08 -0700)]
Reconcile with honeycomb-mr2-release honeycomb-LTE-release

Change-Id: I07d4e3193af523ef98d93716d0ec9419b138792a

13 years agoHLJ85
The Android Automerger [Fri, 24 Jun 2011 14:20:06 +0000 (07:20 -0700)]
HLJ85

Change-Id: I30986e03b57683a77656b412683d448dfa725f79

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 24 Jun 2011 14:19:57 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoresolved conflicts for merge of 972433bd to master
David 'Digit' Turner [Fri, 24 Jun 2011 11:45:26 +0000 (13:45 +0200)]
resolved conflicts for merge of 972433bd to master

Change-Id: I1320aa02110af4b1cf25d2afde1bd4b587fcb10f

13 years agoam 2ec35cc8: am 4aed6434: am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux...
Raphael [Thu, 23 Jun 2011 21:31:21 +0000 (14:31 -0700)]
am 2ec35cc8: am 4aed6434: am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.

* commit '2ec35cc88f10bcd11d3a193d58a1ab245caebce5':
  SDK: properly strip all SDK llvm-rs-cc linux binaries.

13 years agoam a85ebfb0: am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU...
David 'Digit' Turner [Thu, 23 Jun 2011 21:29:59 +0000 (14:29 -0700)]
am a85ebfb0: am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"

* commit 'a85ebfb059080865a549539a9d2758c4e8b8aeed':
  Turn-off implicit GNU Make RC/SCCS rules

13 years agoresolved conflicts for merge of 732936d9 to master
Raphael [Thu, 23 Jun 2011 20:52:29 +0000 (13:52 -0700)]
resolved conflicts for merge of 732936d9 to master

Change-Id: I1fc667057aebbbef19bde746ebcc650ac0e8c35c

13 years agoam 6236d356: am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"
David 'Digit' Turner [Thu, 23 Jun 2011 20:13:20 +0000 (13:13 -0700)]
am 6236d356: am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"

* commit '6236d356a01150bc517bd639398df704735cc0fc':
  sdk: provide ABI-dependent atree files

13 years agoam b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"
David 'Digit' Turner [Thu, 23 Jun 2011 20:08:35 +0000 (13:08 -0700)]
am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"

* commit 'b92c7a2c1293d2921739a4d7210b4a0d1c99156b':
  sdk: provide ABI-dependent atree files

13 years agoam cac8e557: Merge "sdk: provide ABI-dependent atree files"
David 'Digit' Turner [Thu, 23 Jun 2011 19:54:41 +0000 (12:54 -0700)]
am cac8e557: Merge "sdk: provide ABI-dependent atree files"

* commit 'cac8e55714424d385da5b40e5952dc539e510454':
  sdk: provide ABI-dependent atree files

13 years agoMerge "sdk: provide ABI-dependent atree files"
David 'Digit' Turner [Thu, 23 Jun 2011 19:18:49 +0000 (12:18 -0700)]
Merge "sdk: provide ABI-dependent atree files"

13 years agoam de50d0ab: am d6605405: am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn...
Raphael Moll [Thu, 23 Jun 2011 15:16:38 +0000 (08:16 -0700)]
am de50d0ab: am d6605405: am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."

* commit 'de50d0ab2008cbf836dc4fcbe9131a2071265946':
  Envsetup: Cygwin doesn't have 'ps -o command'.

13 years agoReconcile with gingerbread-release
The Android Open Source Project [Thu, 23 Jun 2011 14:27:04 +0000 (07:27 -0700)]
Reconcile with gingerbread-release

Change-Id: I52a808eebd1d2ca2711fe13f92ffc71c5ff7ab0a

13 years agoHLJ84
The Android Automerger [Thu, 23 Jun 2011 14:19:19 +0000 (07:19 -0700)]
HLJ84

Change-Id: I124e43579c8be456a16036a5e709a5cc6ffa11a6

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 23 Jun 2011 14:19:13 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoam 18447019: am 4b227c70: am f9f83ed1: Merge "emulator: Enable dex-preoptimization"
David 'Digit' Turner [Thu, 23 Jun 2011 12:28:08 +0000 (05:28 -0700)]
am 18447019: am 4b227c70: am f9f83ed1: Merge "emulator: Enable dex-preoptimization"

* commit '1844701942de578bab6c7f17e14ef695bb8ed7c1':
  emulator: Enable dex-preoptimization

13 years agoam 4b227c70: am f9f83ed1: Merge "emulator: Enable dex-preoptimization"
David 'Digit' Turner [Thu, 23 Jun 2011 12:07:30 +0000 (05:07 -0700)]
am 4b227c70: am f9f83ed1: Merge "emulator: Enable dex-preoptimization"

* commit '4b227c708c1014bd773085ae275275744f239435':
  emulator: Enable dex-preoptimization

13 years agoam f9f83ed1: Merge "emulator: Enable dex-preoptimization"
David 'Digit' Turner [Thu, 23 Jun 2011 11:49:56 +0000 (04:49 -0700)]
am f9f83ed1: Merge "emulator: Enable dex-preoptimization"

* commit 'f9f83ed19e83313ffaf542b148886bcb860ca12e':
  emulator: Enable dex-preoptimization

13 years agoMerge "emulator: Enable dex-preoptimization"
David 'Digit' Turner [Thu, 23 Jun 2011 11:24:50 +0000 (04:24 -0700)]
Merge "emulator: Enable dex-preoptimization"

13 years agosdk: provide ABI-dependent atree files
David 'Digit' Turner [Thu, 23 Jun 2011 10:49:02 +0000 (12:49 +0200)]
sdk: provide ABI-dependent atree files

This patch allows development/sdk/ to provide ABI-specific .atree
files. This is useful to copy prebuilt CPU model-specific files
to the SDK platform image directory.

This is needed to deal with the fact that for ARMv7 platform builds,
the kernel image to use is prebuilt/android-arm/kernel-qemu-armv7 instead
of prebuilt/android-arm/kernel/qemu

Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7

13 years agoam 4aed6434: am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
Raphael [Thu, 23 Jun 2011 02:10:23 +0000 (19:10 -0700)]
am 4aed6434: am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.

* commit '4aed64341c6cff484c9b78fed3d13131049858c9':
  SDK: properly strip all SDK llvm-rs-cc linux binaries.

13 years agoam 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
Raphael [Thu, 23 Jun 2011 02:05:16 +0000 (19:05 -0700)]
am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.

* commit '0b6ece9dafcf6f06dd4418829434cdc4376375a3':
  SDK: properly strip all SDK llvm-rs-cc linux binaries.

13 years agoam fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS...
David 'Digit' Turner [Thu, 23 Jun 2011 01:05:06 +0000 (18:05 -0700)]
am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"

* commit 'fa112f982241fc3efa0129094e87a34f2317f41e':
  Turn-off implicit GNU Make RC/SCCS rules

13 years agoSDK: properly strip all SDK llvm-rs-cc linux binaries.
Raphael [Fri, 27 May 2011 21:02:31 +0000 (14:02 -0700)]
SDK: properly strip all SDK llvm-rs-cc linux binaries.

Change-Id: Id3f024e90ef04eff4cc13a2202fcc9e94c5ac72f

13 years agoMerge "Use the host STL for host native test."
Ying Wang [Wed, 22 Jun 2011 23:37:12 +0000 (16:37 -0700)]
Merge "Use the host STL for host native test."