Jean-Baptiste Queru
66fb48e840
Merge "Append the list of languages to the list of locales"
2011-07-13 07:55:01 -07:00
Jeff Brown
8e5ce00f37
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
2011-07-12 12:11:36 -07:00
Jeff Brown
e33ba4c49e
Remove the simulator target from all makefiles.
...
Bug: 5010576
Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
2011-07-11 23:51:37 -07:00
Eric Laurent
5b263167cd
Merge "Revert "Added webrtc audio processing library""
2011-07-11 19:28:10 -07:00
Eric Laurent
e7b7c0c921
Revert "Added webrtc audio processing library"
...
This reverts commit 14052b8db5
2011-07-11 19:14:11 -07:00
Eric Laurent
b768b51afd
Merge "Added webrtc audio processing library"
2011-07-11 18:10:45 -07:00
Scott Main
84c11c2605
am 7c32eeba: am 040221a9: am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
...
* commit '7c32eebac5bc5811f95bf2209ad80fcc6ebb550a':
docs: fix xss vulnerability bug 5008593
2011-07-11 17:09:48 -07:00
Jaikumar Ganesh
063b1a12bb
am 981c1de4: am eb0a62cb: (-s ours) am b399f5e8: Merge "Rename health shared library."
...
* commit '981c1de41a731bf7517f4604bfa351993462e986':
Rename health shared library.
2011-07-11 17:09:30 -07:00
Jean-Baptiste Queru
18a298e7bc
Merge "Add PhotoEditor in AOSP builds"
2011-07-11 09:49:25 -07:00
Doug Kwan
a6467cc874
Disable gcc-4.6's Wunused-but-set-variables warning.
...
Change-Id: Ia02fa536410b9200beca1d9d120ec448c82e5ca8
2011-07-08 18:50:10 -07:00
Joe Malin
2ed3603ad9
am dcca65cb: am 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
...
* commit 'dcca65cb1d1ca1ae108b417ebd7241f397012b45':
DOC CHANGE: Change GTV icons for home page
2011-07-08 17:53:03 -07:00
Scott Main
7c32eebac5
am 040221a9: am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
...
* commit '040221a9949c9f158cb7fc20b70b065289fcbbb1':
docs: fix xss vulnerability bug 5008593
2011-07-08 17:45:38 -07:00
Scott Main
040221a994
am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
...
* commit '1e03253bf263472ea0028d2518292beaf4cbe01a':
docs: fix xss vulnerability bug 5008593
2011-07-08 17:44:08 -07:00
Scott Main
1e03253bf2
Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
2011-07-08 17:42:40 -07:00
Scott Main
76a62f2deb
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
2011-07-08 16:27:20 -07:00
Jean-Baptiste Queru
297d0ac0b5
Add PhotoEditor in AOSP builds
...
Change-Id: If0a302701c4b6d2ebfb6b5dd6896d6717411553b
2011-07-08 16:19:42 -07:00
Jaikumar Ganesh
981c1de41a
am eb0a62cb: (-s ours) am b399f5e8: Merge "Rename health shared library."
...
* commit 'eb0a62cb26d7bed289df823e2d68e422c39b5659':
Rename health shared library.
2011-07-08 12:12:14 -07:00
Jaikumar Ganesh
eb0a62cb26
am b399f5e8: Merge "Rename health shared library."
...
* commit 'b399f5e81e2a644776f163e499df5bd0a38fe272':
Rename health shared library.
2011-07-08 11:34:46 -07:00
Jaikumar Ganesh
b399f5e81e
Merge "Rename health shared library."
2011-07-08 11:25:33 -07:00
Jaikumar Ganesh
19efd6f11f
Rename health shared library.
...
Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9
2011-07-08 11:20:49 -07:00
Joe Malin
dcca65cb1d
am 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
...
* commit '2c97d30fefed3430daa356418146d2cbb1f23c8f':
DOC CHANGE: Change GTV icons for home page
2011-07-08 10:38:37 -07:00
Jaikumar Ganesh
ac82cdda8c
Merge "Add Bluetooth health to the PRODUCT_PACKAGE."
2011-07-08 09:40:27 -07:00
Joe Malin
2c97d30fef
am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
...
* commit '8cf99f0ccee8ecc95183f939d633a514e7eebdfb':
DOC CHANGE: Change GTV icons for home page
2011-07-08 09:29:29 -07:00
Jaikumar Ganesh
d849b65d91
Add Bluetooth health to the PRODUCT_PACKAGE.
...
Change-Id: Ifb668f74c09a321eea9d2785f7574cd637aff092
2011-07-07 18:08:15 -07:00
Jean-Baptiste Queru
3636cb72a2
Merge "Add VideoEditor to full builds"
2011-07-07 15:48:04 -07:00
Jean-Baptiste Queru
0aeec5e139
Add VideoEditor to full builds
...
Change-Id: Iaaecaa24b25c67642197d4926aa7f350991abf60
2011-07-07 15:30:15 -07:00
The Android Open Source Project
e4fc9fe78f
Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
...
Change-Id: I8ea53082a2a9d54a8004ff834d2344b989ca0fbf
2011-07-07 15:22:25 -07:00
android-merger
18edf674de
GRJ90C - a test build
...
Change-Id: Ieabc475f7e45db1d79a56036fdb377c52bd8f1ac
2011-07-07 14:45:05 -07:00
Doug Zongker
aa97ed5369
Merge "Prevent "::" in PATH on multiple lunch"
2011-07-07 11:24:41 -07:00
android-merger
3afeba0da6
GRJ90B - a test build
...
Change-Id: I54aefd71dc35381aed8ab1fbf99280d566520c0c
2011-07-07 10:40:48 -07:00
Ying Wang
4227d02e6f
Merge "Enable LOCAL_STRIP_MODULE for prebuilt binaries"
2011-07-07 09:29:19 -07:00
The Android Automerger
834084f8cf
HLK07
...
Change-Id: I9442d2198c19df9fadfcb19868cde304c4088444
2011-07-07 07:19:53 -07:00
The Android Automerger
6c13f89dd2
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-07 07:19:47 -07:00
Ji-Hwan Lee
0219e9292e
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
2011-07-07 11:07:18 +09:00
The Android Automerger
c89e9a0d04
Set build id to HTJ85B
...
Change-Id: I00c0a1209127ade88bf49bb821234c0da04ca029
2011-07-06 17:45:44 -07:00
Joe Malin
8cf99f0cce
DOC CHANGE: Change GTV icons for home page
...
Change-Id: If7172345173b165350417ab52f706d6444dc4d96
2011-07-06 13:37:00 -07:00
The Android Automerger
eab679e854
HTK06
...
Change-Id: I61cda8058f46a955ed7217f90ab5d0601627b300
2011-07-06 13:01:56 -07:00
The Android Open Source Project
900eef9b23
Reconcile with gingerbread-release honeycomb-LTE-release
...
Change-Id: Ide009ee977f3b2a5344dcb4843a9274380658560
2011-07-06 07:35:15 -07:00
The Android Automerger
0345d82bc5
HLK06
...
Change-Id: Id9a931f0e2f1e9d11ee40335c19890206541279a
2011-07-06 07:13:59 -07:00
The Android Automerger
d85f9d55bf
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-06 07:13:54 -07:00
Ying Wang
c0a177c8ec
Remove vpn from FRAMEWORKS_BASE_SUBDIRS
...
To eliminate build warning.
Reference commit: 44e27b5c74b5f441973561a4f945cb58e0cc45a4
which removed framework/base/vpn.
Change-Id: I539e4bc2a4008c8b9eed74dd53eec1f55db3abe5
2011-07-05 15:37:22 -07:00
The Android Automerger
60173db18c
HLK05
...
Change-Id: I4c789558d8e510bf250ca5ccbfce292dc39dbd5a
2011-07-05 07:15:28 -07:00
The Android Automerger
7748ec1bf6
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-05 07:15:24 -07:00
The Android Automerger
def6f1e02d
HLK04
...
Change-Id: Ib862c2fb576f0ce3becb00a576db2566ec319823
2011-07-04 07:18:52 -07:00
The Android Automerger
df57640098
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-04 07:18:47 -07:00
Ji-Hwan Lee
752ad06eec
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
2011-07-04 14:09:47 +09:00
The Android Automerger
6b33cf0cd3
HLK01B
...
Change-Id: I94bde12eeace63caa24bc545d97e8af49a7d53e5
2011-07-01 15:37:50 -07:00
The Android Automerger
654a54671a
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-01 15:37:44 -07:00
Eino-Ville Talvala
b8de151fd8
Add mobile filter framework java library to core target files.
...
Change-Id: Ia4892d8c49be905ec68423224ca44c8558edbdb8
2011-07-01 10:29:08 -07:00
Mike Lockwood
40b5a67ecd
Remove obsolete persist.service.adb.enable property from default.prop
...
Change-Id: I59a2da01eddfc1fa775e027a86f7f818a146a6b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-01 12:31:47 -04:00