OSDN Git Service
The Android Automerger [Tue, 12 Jul 2011 13:41:20 +0000 (06:41 -0700)]
IRK12
Change-Id: Ie4f49e347d4ebd78a727f074e57606dd0a0c5241
The Android Automerger [Tue, 12 Jul 2011 13:41:12 +0000 (06:41 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 12 Jul 2011 13:20:37 +0000 (06:20 -0700)]
IRK11B
Change-Id: I77c9ba727248130f8efd56fec3c64e17cb19b3d0
Eric Laurent [Tue, 12 Jul 2011 02:28:10 +0000 (19:28 -0700)]
Merge "Revert "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
Eric Laurent [Tue, 12 Jul 2011 01:10:45 +0000 (18:10 -0700)]
Merge "Added webrtc audio processing library"
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
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.
Jean-Baptiste Queru [Mon, 11 Jul 2011 16:49:25 +0000 (09:49 -0700)]
Merge "Add PhotoEditor in AOSP builds"
The Android Automerger [Mon, 11 Jul 2011 13:45:16 +0000 (06:45 -0700)]
IRK11
Change-Id: Ib4f722c41d63641f0b2d6caf883ed17e8e6c7e40
The Android Automerger [Mon, 11 Jul 2011 13:45:07 +0000 (06:45 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Sun, 10 Jul 2011 21:57:41 +0000 (14:57 -0700)]
IRK10B
Change-Id: I1bb00e12faeb029e8260b97f5f108110f035862e
The Android Automerger [Sun, 10 Jul 2011 13:47:02 +0000 (06:47 -0700)]
IRK10
Change-Id: I86c078cf38ec165881733f4fabdb5a1fdc263361
The Android Automerger [Sun, 10 Jul 2011 13:46:49 +0000 (06:46 -0700)]
merge in ics-release history after reset to master
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
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
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
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
Scott Main [Sat, 9 Jul 2011 00:42:40 +0000 (17:42 -0700)]
Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
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
Jean-Baptiste Queru [Fri, 8 Jul 2011 23:19:42 +0000 (16:19 -0700)]
Add PhotoEditor in AOSP builds
Change-Id: If0a302701c4b6d2ebfb6b5dd6896d6717411553b
The Android Automerger [Fri, 8 Jul 2011 21:11:31 +0000 (14:11 -0700)]
IRK08
Change-Id: I69202d4eaf866599db3a8922d3111a0e53bd75e2
The Android Automerger [Fri, 8 Jul 2011 21:11:01 +0000 (14:11 -0700)]
merge in ics-release history after reset to master
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.
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.
Jaikumar Ganesh [Fri, 8 Jul 2011 18:25:33 +0000 (11:25 -0700)]
Merge "Rename health shared library."
Jaikumar Ganesh [Fri, 8 Jul 2011 18:20:23 +0000 (11:20 -0700)]
Rename health shared library.
Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9
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
The Android Automerger [Fri, 8 Jul 2011 17:20:05 +0000 (10:20 -0700)]
IRK07F - take two
Change-Id: Ifbda103ca1cca87e8eda5d49092e60a7d45c0eae
Jaikumar Ganesh [Fri, 8 Jul 2011 16:40:27 +0000 (09:40 -0700)]
Merge "Add Bluetooth health to the PRODUCT_PACKAGE."
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
The Android Automerger [Fri, 8 Jul 2011 05:55:08 +0000 (22:55 -0700)]
IRK07F
Change-Id: I2bbd1850c564e8201f069ee7a2348b7d6fb4362e
The Android Automerger [Fri, 8 Jul 2011 02:37:44 +0000 (19:37 -0700)]
IRK07E
Change-Id: I203c38bd88c3cbc82c523f49bfc500c1249f2c2d
The Android Automerger [Fri, 8 Jul 2011 02:24:05 +0000 (19:24 -0700)]
IRK07D
Change-Id: Ia0b2fe42c177d7ef9cd3566838b50bfa332cb5ff
Jaikumar Ganesh [Fri, 8 Jul 2011 01:08:15 +0000 (18:08 -0700)]
Add Bluetooth health to the PRODUCT_PACKAGE.
Change-Id: Ifb668f74c09a321eea9d2785f7574cd637aff092
Jean-Baptiste Queru [Thu, 7 Jul 2011 22:48:04 +0000 (15:48 -0700)]
Merge "Add 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
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
The Android Automerger [Thu, 7 Jul 2011 21:50:30 +0000 (14:50 -0700)]
IRK07C
Change-Id: I8be6929477556cb5bc07c6f2ae62ec230fd6172b
android-merger [Thu, 7 Jul 2011 21:45:05 +0000 (14:45 -0700)]
GRJ90C - a test build
Change-Id: Ieabc475f7e45db1d79a56036fdb377c52bd8f1ac
The Android Automerger [Thu, 7 Jul 2011 19:29:15 +0000 (12:29 -0700)]
IRK07B
Change-Id: Icc4d668ba78e9daf3901a5999ace5ee0c124bca7
The Android Automerger [Thu, 7 Jul 2011 19:29:08 +0000 (12:29 -0700)]
merge in ics-release history after reset to master
Doug Zongker [Thu, 7 Jul 2011 18:24:41 +0000 (11:24 -0700)]
Merge "Prevent "::" in PATH on multiple lunch"
android-merger [Thu, 7 Jul 2011 17:40:48 +0000 (10:40 -0700)]
GRJ90B - a test build
Change-Id: I54aefd71dc35381aed8ab1fbf99280d566520c0c
Ying Wang [Thu, 7 Jul 2011 16:29:19 +0000 (09:29 -0700)]
Merge "Enable LOCAL_STRIP_MODULE for prebuilt binaries"
The Android Automerger [Thu, 7 Jul 2011 14:19:53 +0000 (07:19 -0700)]
HLK07
Change-Id: I9442d2198c19df9fadfcb19868cde304c4088444
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
The Android Automerger [Thu, 7 Jul 2011 13:46:19 +0000 (06:46 -0700)]
IRK07
Change-Id: Ic0a4e178f2101b97e28f966ad9af3997afa73cee
The Android Automerger [Thu, 7 Jul 2011 13:46:02 +0000 (06:46 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Thu, 7 Jul 2011 00:45:44 +0000 (17:45 -0700)]
Set build id to HTJ85B
Change-Id: I00c0a1209127ade88bf49bb821234c0da04ca029
Joe Malin [Fri, 1 Jul 2011 19:51:48 +0000 (12:51 -0700)]
DOC CHANGE: Change GTV icons for home page
Change-Id: If7172345173b165350417ab52f706d6444dc4d96
The Android Automerger [Wed, 6 Jul 2011 20:01:56 +0000 (13:01 -0700)]
HTK06
Change-Id: I61cda8058f46a955ed7217f90ab5d0601627b300
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
The Android Automerger [Wed, 6 Jul 2011 14:13:59 +0000 (07:13 -0700)]
HLK06
Change-Id: Id9a931f0e2f1e9d11ee40335c19890206541279a
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
The Android Automerger [Wed, 6 Jul 2011 13:41:59 +0000 (06:41 -0700)]
IRK06
Change-Id: Ib9d88ebebfef518970dc28fa8db1d25c0b7e6245
The Android Automerger [Wed, 6 Jul 2011 13:41:55 +0000 (06:41 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Tue, 5 Jul 2011 14:15:28 +0000 (07:15 -0700)]
HLK05
Change-Id: I4c789558d8e510bf250ca5ccbfce292dc39dbd5a
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
The Android Automerger [Tue, 5 Jul 2011 13:44:06 +0000 (06:44 -0700)]
IRK05
Change-Id: Ic2f9802df544ba7deea4d7453a79f54351c97fbc
The Android Automerger [Tue, 5 Jul 2011 13:44:01 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Mon, 4 Jul 2011 14:18:52 +0000 (07:18 -0700)]
HLK04
Change-Id: Ib862c2fb576f0ce3becb00a576db2566ec319823
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
The Android Automerger [Mon, 4 Jul 2011 13:48:21 +0000 (06:48 -0700)]
IRK04
Change-Id: I5b1344966caf96375f99889108ab1431e4de5268
The Android Automerger [Mon, 4 Jul 2011 13:47:53 +0000 (06:47 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Fri, 1 Jul 2011 22:37:50 +0000 (15:37 -0700)]
HLK01B
Change-Id: I94bde12eeace63caa24bc545d97e8af49a7d53e5
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
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
The Android Automerger [Fri, 1 Jul 2011 16:51:11 +0000 (09:51 -0700)]
IRJ91D
Change-Id: If04bf69185523a44c48187b4cae5de9d1d84960d
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>
The Android Automerger [Fri, 1 Jul 2011 14:19:24 +0000 (07:19 -0700)]
HLK01
Change-Id: I3c25b979402a5843c5bcba58336dc0d9a805503c
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
The Android Automerger [Fri, 1 Jul 2011 04:40:59 +0000 (21:40 -0700)]
IRJ91C
Change-Id: Ic509b00890d09f2e8984a04a6c3c562d0c9f2e8f
The Android Automerger [Thu, 30 Jun 2011 23:24:05 +0000 (16:24 -0700)]
IRJ91B
Change-Id: Iba64fa1e0013660cb72b0dc6b80537baadf7580d
The Android Automerger [Thu, 30 Jun 2011 14:19:12 +0000 (07:19 -0700)]
HLJ91
Change-Id: Ib4ae3dd4de51cbc0f736e5db90670bbea9264b7e
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
The Android Automerger [Thu, 30 Jun 2011 13:44:35 +0000 (06:44 -0700)]
IRJ91
Change-Id: I1b7a83362578dd17eaa50883a314f20fe8548749
The Android Automerger [Thu, 30 Jun 2011 13:44:17 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 29 Jun 2011 23:29:36 +0000 (16:29 -0700)]
IRJ90B
Change-Id: I9942b4d7a0d036c4e1db297d1e61ea145a80da1d
android-merger [Wed, 29 Jun 2011 18:16:15 +0000 (11:16 -0700)]
GRJ90
Change-Id: I76536224052c1e921ac7887bd772bcdf725f36b2
The Android Automerger [Wed, 29 Jun 2011 14:18:20 +0000 (07:18 -0700)]
HLJ90
Change-Id: Ic5c6aa3728e51af7fce0ca2d8afcf79bc17dfd80
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
The Android Automerger [Wed, 29 Jun 2011 13:46:32 +0000 (06:46 -0700)]
IRJ90
Change-Id: I3aae6e03976b642bb38356b72f14f56699d13ae9
The Android Automerger [Wed, 29 Jun 2011 13:46:26 +0000 (06:46 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 28 Jun 2011 22:11:24 +0000 (15:11 -0700)]
HLJ89B
Change-Id: I5c5c7e0355a70123aa3a598bf33055b9fdc75cc5
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
The Android Automerger [Tue, 28 Jun 2011 20:51:32 +0000 (13:51 -0700)]
IRJ89B
Change-Id: Ie5c6c6a60763b4002d65c45bdd18fb3b0e195403
The Android Automerger [Tue, 28 Jun 2011 14:19:46 +0000 (07:19 -0700)]
HLJ89
Change-Id: I2566542dd48247e7010606b4ba0d6edab81e6c67
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
The Android Automerger [Tue, 28 Jun 2011 13:44:44 +0000 (06:44 -0700)]
IRJ89
Change-Id: Ib10522e07dafa39a8ba14997815050ca9378b115
The Android Automerger [Tue, 28 Jun 2011 13:44:28 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
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
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
The Android Automerger [Mon, 27 Jun 2011 21:25:17 +0000 (14:25 -0700)]
IRJ88B
Change-Id: Ifc0122c6a9434d78c69745c864ae068f7a32a375
The Android Automerger [Mon, 27 Jun 2011 21:25:03 +0000 (14:25 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Mon, 27 Jun 2011 15:17:16 +0000 (08:17 -0700)]
HLJ88
Change-Id: I886289d92b6850bd83c86cd48e182025ab137a0c
OSDN Git Service
