Commit graph

6567 commits

Author SHA1 Message Date
Bruce Beare
37db6cf627 English must be the first language specified
The first language specified in PRODUCT_LOCALS is the default.

Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-11-29 15:46:28 -08:00
Tor Norbye
dc2450ca25 Build fix - include sdk/lint in build. 2011-11-28 15:05:31 -08:00
Jean-Baptiste Queru
d2cbcb40c0 Restore AOSP-specific pseudo-version-numbers.
For great justice.

Change-Id: I5a0f722419bff676142ce975a66225f0cd418ff8
2011-11-22 12:21:00 -08:00
Jean-Baptiste Queru
1623f79c75 Merge from ics-mr0
Change-Id: I5667c315fab589a2dc39e000a81397d317691895
2011-11-11 19:47:47 -08:00
The Android Open Source Project
324c814c6f Merge from AOSP
Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647
2011-11-11 16:03:56 -08:00
Jean-Baptiste Queru
f9b556cd51 Add a hash-bang as the first line of a shell script
Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf
2011-11-11 14:37:31 -08:00
Doug Zongker
a5f534df07 use frozensets to represent APK cert sets
Change-Id: Ic92c83be0c3f6a76bf1bd21f0216cd1b87586959
2011-11-11 09:51:37 -08:00
The Android Open Source Project
600298c0ba Merge from ics-mr0
Change-Id: I759452c031b9e2f02905dd488b61f100e3eaa87a
2011-11-10 18:26:45 -08:00
Jim Huang
cb48497ff2 HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
2011-11-10 13:28:13 -08:00
Conley Owens
e915ab45a1 Place linker arguments after objects for gcc
gcc 4.6.1 does not properly link if libraries are specified before
objects.

Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
2011-11-10 10:55:13 -08:00
Doug Zongker
278c9781ec to be upgraded, APKs must have exactly the same set of certs
Change-Id: I0d528d3d55e5ee553e57e63ed1f998172c6306f8
2011-11-09 10:32:23 -08:00
James Dong
ddc943da7e Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4

related-to-bug: 5566262
2011-11-04 14:08:36 -07:00
Brian Muramatsu
277be2fe0c Stop Packaging Old CTS Test Runner Files
Bug 5563917

This stops packaging the startcts script and the cts.jar into
the android-cts.zip. Since we are only testing using Tradefed,
we should prevent confusion by removing the old test runner.

Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
2011-11-03 11:42:39 -07:00
The Android Open Source Project
5b85b1900c Reconcile with ics-factoryrom-2-release
Change-Id: I5488896eaf252e88fd0a7c8052c1e27be3f91e6f
2011-11-01 10:08:00 -07:00
The Android Automerger
d8e44bce6f ITL31 2011-10-31 16:41:16 -07:00
The Android Open Source Project
db6281e8bb Reconcile with ics-factoryrom-2-release
Change-Id: I7f53fdbe6acf900cdd3322d238bf6fa659c95ff0
2011-10-31 12:43:34 -07:00
The Android Automerger
a93af2b685 ITL30B 2011-10-30 13:51:03 -07:00
The Android Automerger
3c810f8639 ITL30 2011-10-30 12:35:43 -07:00
The Android Automerger
0b0ff231cd merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-10-30 12:34:39 -07:00
The Android Automerger
6d907b114d ITL28B 2011-10-28 23:24:05 -07:00
The Android Automerger
05bf9a2151 ITL28 2011-10-28 20:27:28 -07:00
The Android Open Source Project
d50bc1bb3c Reconcile with ics-factoryrom-2-release
Change-Id: Ieddd7ec26db003b46bfc01db728a5795cbff61ab
2011-10-28 09:43:52 -07:00
Jean-Baptiste Queru
432f8d881d Reconcile with AOSP master
Change-Id: I01bd9c391b6adaabbad233b308c5dbecfd9f2827
2011-10-28 08:23:21 -07:00
The Android Automerger
b76ac5198f ITL27 2011-10-27 19:31:15 -07:00
The Android Automerger
4e04760e39 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-10-27 19:29:34 -07:00
Jim Huang
fddf23f19e HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
2011-10-27 10:38:10 -07:00
Ed Heyl
1f8f191e91 ITL26B
Change-Id: I1ab93cc9a63d5873bc4aecc17a45f474828dc981
2011-10-27 09:08:07 +00:00
Ying Wang
b3e6fa5e6b Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0 2011-10-26 21:04:01 -07:00
Jeff Davidson
033fbe28c2 Support signing target_files without a recovery.fstab.
Change-Id: I7d6f511c69d589bf035ac3eb7eeee4b0e0505faa
2011-10-26 18:16:13 -07:00
Scott Main
8bb6ea5995 Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0 2011-10-26 13:16:13 -07:00
Scott Main
360240097a docs: add new style for adding "deprecated" messages to dev guides
Change-Id: I0d690a6c0880343919114370331b7c2756b6a50e
2011-10-24 16:45:58 -07:00
Ying Wang
79e3dec83e new LOCAL_DEX_PREOPT option "nostripping"
Set "LOCAL_DEX_PREOPT := nostripping" to do dex-preopt while not strip
the classes.dex.

Bug: 5396625 5502338
Change-Id: Ie8dea4414ebeefeae89c6433b246faea27baa5e7
2011-10-24 12:29:25 -07:00
Chia-chi Yeh
07767a9e74 Move VpnDialogs into core.mk.
It is required by the APIs of user space VPN.
Also remove the dead VpnServices.

Bug: 5495078
Change-Id: I321b8da16898cd547ed79bea9c264b5e7bc781eb
2011-10-21 16:13:54 -07:00
Scott Main
51372cd2e5 docs: update "na" style to make opaque, add dropshadow, and re-order
z-index to be on top of images

Change-Id: I7c0c2e15d511f4362eb721bf8eb0343fa3f24bc0
2011-10-19 16:09:26 -07:00
Ying Wang
5537020242 Remvoe whisperd from user_tags.mk.
Change-Id: Ib271c568a6e6907d033040dbe6c3574124fbe469

Bug: 5473754
2011-10-17 17:59:44 -07:00
Maarten Hooft
068bf1a601 Merge " Added Hindi to the list of languages to build under the full target." into ics-mr0 2011-10-17 17:37:00 -07:00
Maarten Hooft
e8985fc022 Added Hindi to the list of languages to build under the full target.
Change-Id: I57201097e5ba1337249dde8b6efe704d75bf05b3
2011-10-17 13:40:24 -07:00
Dianne Hackborn
a0f464a8e7 New PRODUCT_AAPT_PREF_CONFIG.
To use the new aapt --preferred-configurations option.  For use with Prime
to be able to strip everything but xhdpi density bitmaps selectively,
not stripping when this would result in no data for the resource.

Change-Id: I4e1012929b8f9b0b1e79c06496647f69661ba1f2
2011-10-14 19:37:57 -07:00
Dima Zavin
854233e9b2 core: remove the built fake packages (not installed) on installclean
Change-Id: I1ff3754132a48c545d0a3215ae23d204aba50637
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-12 13:34:32 -07:00
Yuli Huang
5b124642b5 Remove PhotoEditor from mk file.
Change-Id: Ia650e4dac0babb82fe2cb43073126f9e93b57362
2011-10-13 00:28:28 +08:00
Dima Zavin
7dac5909d2 core: remove fake package timestamps on installclean
Change-Id: Ic07af1f751b301b69fa5cbbb7bf51ad718d54d52
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-11 15:54:10 -07:00
Ed Heyl
738f053bf3 mr0 - do not merge
Change-Id: I3b19b8cdad6820bc8ab2047ac48cb2964132a3fa
2011-10-11 06:40:06 -07:00
The Android Open Source Project
2b2bf3985e Reconcile with ics-factoryrom-release
Change-Id: I0a35a81c49649458f8c02b093a8638539c65049d
2011-10-11 04:29:21 -07:00
The Android Automerger
7542db075d IFL10 2011-10-10 20:40:43 -07:00
The Android Automerger
12e856238b merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-10 20:37:22 -07:00
The Android Open Source Project
2df17b4588 Reconcile with ics-factoryrom-release
Change-Id: Ibd9094406b6984d8a27179eb934edc05d3a43321
2011-10-10 07:27:25 -07:00
The Android Automerger
629bd7609f IFL09 2011-10-09 13:31:47 -07:00
The Android Automerger
04cbd261c8 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-09 13:28:28 -07:00
The Android Automerger
633d87b11e IFL07B 2011-10-07 22:23:44 -07:00
The Android Automerger
94ea143ff8 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-07 22:22:43 -07:00