Ying Wang
41346ae407
am ba35b2d6
: resolved conflicts for merge of 162991be
to gingerbread-plus-aosp
...
* commit 'ba35b2d61531a071533891307904e6ad7f81fb65':
Allow uninstallable APPs.
2011-09-07 11:25:42 -07:00
Ying Wang
ba35b2d615
resolved conflicts for merge of 162991be
to gingerbread-plus-aosp
...
Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
2011-09-07 11:20:28 -07:00
Ying Wang
162991beb5
Allow uninstallable APPs.
...
Bug: 5264671
This is needed by cts tests.
It's harmless to existing modules.
Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
2011-09-07 10:32:39 -07:00
Brian Muramatsu
3eae5b7c1b
am 08b8e002
: am 2306106d
: Use package.apk.unaligned in CTS Build
...
* commit '08b8e0024812ea907cf3938bcd07b8dca6188eaf':
Use package.apk.unaligned in CTS Build
2011-09-02 16:56:07 -07:00
Brian Muramatsu
08b8e00248
am 2306106d
: Use package.apk.unaligned in CTS Build
...
* commit '2306106d3e2cd774ef0b2cd782442f90c402341f':
Use package.apk.unaligned in CTS Build
2011-09-02 16:53:43 -07:00
Brian Muramatsu
2306106d3e
Use package.apk.unaligned in CTS Build
...
Bug 5252989
This prevents dexopt installation failures when trying to
install CTS apks on production devices.
Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
2011-09-02 15:29:10 -07:00
Ying Wang
a1b603a556
am 4b398749
: am c5033a33
: Merge "x86: remove obsolete comments"
...
* commit '4b3987498eb15dc654fe572aadf53396aac36479':
x86: remove obsolete comments
2011-08-26 12:12:48 -07:00
Ying Wang
4b3987498e
am c5033a33
: Merge "x86: remove obsolete comments"
...
* commit 'c5033a3357b824a8285da67357a0d289750f4a72':
x86: remove obsolete comments
2011-08-26 12:10:45 -07:00
Ying Wang
c5033a3357
Merge "x86: remove obsolete comments"
2011-08-26 10:41:16 -07:00
David 'Digit' Turner
3db43165b0
am 80d41e4b
: am a2cc9b22
: Merge "sdk: add DLL_EXTENSION as an atree variable"
...
* commit '80d41e4b7555aed399c7bd23647947d7eade3fe6':
sdk: add DLL_EXTENSION as an atree variable
2011-08-25 14:30:00 -07:00
David 'Digit' Turner
6da54b6e0e
resolved conflicts for merge of 7be88d00
to honeycomb-plus-aosp
...
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
2011-08-25 23:23:32 +02:00
David 'Digit' Turner
80d41e4b75
am a2cc9b22
: Merge "sdk: add DLL_EXTENSION as an atree variable"
...
* commit 'a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
sdk: add DLL_EXTENSION as an atree variable
2011-08-25 12:14:35 -07:00
David 'Digit' Turner
7be88d00bb
am 77c6261f
: Merge "emulator: Enable GLES emulation libraries"
...
* commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
emulator: Enable GLES emulation libraries
2011-08-25 12:14:33 -07:00
David 'Digit' Turner
a2cc9b227a
Merge "sdk: add DLL_EXTENSION as an atree variable"
2011-08-25 12:03:03 -07:00
David 'Digit' Turner
77c6261fb0
Merge "emulator: Enable GLES emulation libraries"
2011-08-25 12:02:34 -07:00
David 'Digit' Turner
557c51f2ea
sdk: add DLL_EXTENSION as an atree variable
...
This patch defines the DLL_EXTENSION variable to the host
shared library suffix (i.e. either ".so", ".dll" or ".dylib")
when packaging the SDK.
This is required by another patch to sdk/build/tools.atree that
will use ${DLL_EXTENSION} to copy the GLES emulation host libraries
to $SDK/tools/lib
Change-Id: I120d39e905afb453b0702d5f0eb2707f214385cc
2011-08-25 14:28:03 +02:00
David 'Digit' Turner
43dd89d2a0
emulator: Enable GLES emulation libraries
...
This patch enables the build of OpenGLES emulation libraries
(both in the guest and the host) for any emulator-specific
product config.
+ update core/main.mk to ensure that the right path is parsed
when building the Windows SDK
Change-Id: Ifde047f8c0ef922504a7286c8c5b57f7c79c71f8
2011-08-23 22:25:13 +02:00
Ying Wang
2bcdfe145d
am 4651ee5d
: am 7c7a8f02
: Merge "Sort the results of findleaves again."
...
* commit '4651ee5db200772921bad828c280d165ff3997c3':
Sort the results of findleaves again.
2011-08-19 09:35:50 -07:00
Ying Wang
4651ee5db2
am 7c7a8f02
: Merge "Sort the results of findleaves again."
...
* commit '7c7a8f023af38e7e8be7cbb6acbe1ab770cdd704':
Sort the results of findleaves again.
2011-08-19 09:32:40 -07:00
Wink Saville
43c1533988
Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8
to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-08-19 09:28:34 -07:00
Ying Wang
7c7a8f023a
Merge "Sort the results of findleaves again."
2011-08-19 09:24:44 -07:00
Ishida, Haruyasu
58e52b434b
Sort the results of findleaves again.
...
Commit d36e945
changed findleaves.py to sort the output files so that
the order is deterministic and won't cause spurious build errors when
files happen to be listed (and hence read) in different order on
e.g. add/remove the makefiles.
This correction broke after commit 4820a94
because the conversion to
a set with set() in order to remove duplicates came after sort() and
potentially altered the order of the elements.
This commit fixes makes sure findleaves.py is guaranteed to return
a sorted filename list without duplicates.
Change-Id: Ifd96d04d45641fe43d4cc4739f78a2d4d25cc212
2011-08-19 08:14:53 +02:00
Raphael Moll
cfdfad3fca
am 807c7980
: am 7d9fe517
: Merge "Add sdk/rule_api to the Windows build paths."
...
* commit '807c79802d5e8b1613bf36bb780cf3250f443aa2':
Add sdk/rule_api to the Windows build paths.
2011-08-17 11:29:48 -07:00
Wink Saville
cd34366886
DO NOT MERGE: resolved conflicts for merge of 15e199c8
to honeycomb-plus-aosp
...
Not merging this change, leaving version at 3.1.4.1.5.9.2.6.5
Change-Id: Ie9efac19da35cb72e8ae636dcfb8962a3c02ac94
2011-08-17 11:27:01 -07:00
Raphael Moll
807c79802d
am 7d9fe517
: Merge "Add sdk/rule_api to the Windows build paths."
...
* commit '7d9fe5174787a5638993a15b165bc9115c16da0f':
Add sdk/rule_api to the Windows build paths.
2011-08-17 11:26:07 -07:00
Raphael Moll
7d9fe51747
Merge "Add sdk/rule_api to the Windows build paths."
2011-08-17 11:06:39 -07:00
Wink Saville
15e199c857
DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
...
Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
2011-08-17 10:03:51 -07:00
Raphael Moll
408c7f8a8f
Add sdk/rule_api to the Windows build paths.
...
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
2011-08-16 19:40:03 -07:00
Ying Wang
6d38bdfc7b
resolved conflicts for merge of a74a4811
to honeycomb-plus-aosp
...
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
2011-08-11 16:55:00 -07:00
Ying Wang
a74a4811ae
am 3f5326fd
: Merge "sha module is deprecated"
...
* commit '3f5326fd9fe2a5c46b4e6643e2b277e7f13cac04':
sha module is deprecated
2011-08-10 18:02:15 -07:00
Ying Wang
3f5326fd9f
Merge "sha module is deprecated"
2011-08-10 17:50:05 -07:00
david
cad0bb9f62
sha module is deprecated
...
This patch removes the deprecated warnings from the python
scripts.
Change-Id: I052a0aab3fb28dd1d78de1307edafda6b6c35e5f
2011-08-10 17:48:04 -07:00
Chih-Wei Huang
aa1c321a58
x86: remove obsolete comments
...
Change-Id: Ifb12892c17a50f85c7700d6413ea295a4dad7047
2011-08-03 12:16:59 +08:00
Jean-Baptiste Queru
c55ebf232e
am 8dd289d3
: Ignore from gingerbread
...
* commit '8dd289d399e76f90e24383a7ffed4b667db6cbb3':
Updating version to 2.3.7 to reflect some patches.
Bumping version to 2.3.6 to reflect a few patches.
2011-08-02 17:09:58 -07:00
Jean-Baptiste Queru
8dd289d399
Ignore from gingerbread
...
We like our AOSP version numbers unchanged and a bit nutty.
Change-Id: Iddfd494bc52f13bdeb90f39393d89f554e2cfb64
2011-08-02 17:04:57 -07:00
Dan Morrill
6d0f51b44b
Updating version to 2.3.7 to reflect some patches.
...
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
2011-08-02 16:46:38 -07:00
Dan Morrill
b3eae868dd
Bumping version to 2.3.6 to reflect a few patches.
...
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
2011-08-02 15:36:05 -07:00
Raphael Moll
dd9e8477e6
am 266a571f
: am dceb4655
: Merge "Add sdk/assetstudio to the Windows build paths."
...
* commit '266a571fbd557c402e937130922ced8c523dd451':
Add sdk/assetstudio to the Windows build paths.
2011-07-29 13:59:23 -07:00
Ying Wang
9b5447df85
am 24cad7d4
: Add iptables and ip6tables to core.mk.
...
* commit '24cad7d4f7962d3413d520791cb2b8a5a5266f58':
Add iptables and ip6tables to core.mk.
2011-07-29 13:58:43 -07:00
Raphael Moll
266a571fbd
am dceb4655
: Merge "Add sdk/assetstudio to the Windows build paths."
...
* commit 'dceb46559eb8077553d1bd4d738fb4b325af9396':
Add sdk/assetstudio to the Windows build paths.
2011-07-29 13:56:51 -07:00
Raphael Moll
dceb46559e
Merge "Add sdk/assetstudio to the Windows build paths."
2011-07-29 13:50:51 -07:00
Ying Wang
24cad7d4f7
Add iptables and ip6tables to core.mk.
...
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
2011-07-29 13:47:23 -07:00
Raphael Moll
667ec86a33
Add sdk/assetstudio to the Windows build paths.
...
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
2011-07-29 13:04:53 -07:00
Kenny Root
3146eb76cf
am 1708a6f7
: am 4880b436
: am 62a2b188
: Merge "Avoid complaining about empty directories"
...
* commit '1708a6f74bf36ad6d520476895695c26bdaf7306':
Avoid complaining about empty directories
2011-07-18 13:48:43 -07:00
Kenny Root
1708a6f74b
am 4880b436
: am 62a2b188
: Merge "Avoid complaining about empty directories"
...
* commit '4880b436656d7cfd00bb82ebde1b408e0bd19bda':
Avoid complaining about empty directories
2011-07-18 13:47:16 -07:00
Kenny Root
4880b43665
am 62a2b188
: Merge "Avoid complaining about empty directories"
...
* commit '62a2b1882fb95e960b5889b46fe8f669ddc7c8ac':
Avoid complaining about empty directories
2011-07-18 13:45:15 -07:00
Kenny Root
62a2b1882f
Merge "Avoid complaining about empty directories"
2011-07-18 13:41:25 -07:00
Kenny Root
7546d613af
Avoid complaining about empty directories
...
Change-Id: If46bffd1c4e6b94f2e476b2d7d506ef337bbf8e1
2011-07-18 13:12:31 -07:00
Kenny Root
1b61d1ba7b
am db549686
: am 099aa4cf
: am b8a1c89b
: Merge "Only include "[a-z]*.bash" files for completion"
...
* commit 'db5496867968fe592de807e606dc11287ca61c6a':
Only include "[a-z]*.bash" files for completion
2011-07-18 12:01:29 -07:00
Kenny Root
db54968679
am 099aa4cf
: am b8a1c89b
: Merge "Only include "[a-z]*.bash" files for completion"
...
* commit '099aa4cf4d82218110c6edf3edede0e72450216e':
Only include "[a-z]*.bash" files for completion
2011-07-18 11:57:24 -07:00