Doug Zongker
cf6d5a9074
bump releasetools python requirement to 2.7
...
These scripts already use some post-2.4 features, so let's make it
official: Python 2.7 is needed to run them.
Change-Id: I256e9ed99b0b62abe4e22a7b1f811acb7419e88e
2014-02-18 10:57:07 -08:00
Narayan Kamath
0158f8f71c
am 0003192c
: am 2bea94ba
: Merge "Fix up android.core CTS tests."
...
* commit '0003192c32ff9672a3974709912acc853053c7a8':
Fix up android.core CTS tests.
2014-02-17 13:10:32 +00:00
Narayan Kamath
21f1d95870
am 2a1a308f
: (-s ours) am 70a4a6a3
: Merge "changing the rules following java package renaming for external/apache-harmony."
...
* commit '2a1a308f3bb3f9559461380eb04bfaa0a5554c32':
changing the rules following java package renaming for external/apache-harmony.
2014-02-17 13:10:31 +00:00
Narayan Kamath
7ad6f5f76b
am 35513f4c
: (-s ours) am d4dc88b0
: Merge "Adding apache-harmony to cts."
...
* commit '35513f4c92707745025e039187b0b91783a39af3':
Adding apache-harmony to cts.
2014-02-17 13:05:03 +00:00
Narayan Kamath
129be82091
am 6b835426
: (-s ours) am 92e99b12
: Merge "add jsr166 tests to cts. Bug: 10390711"
...
* commit '6b83542627e28c09b08c0cf131fc9f0f3c30627f':
add jsr166 tests to cts. Bug: 10390711
2014-02-17 12:59:35 +00:00
Narayan Kamath
0003192c32
am 2bea94ba
: Merge "Fix up android.core CTS tests."
...
* commit '2bea94bac78d8a8ed5030d1e09d48db677e1167d':
Fix up android.core CTS tests.
2014-02-17 12:31:00 +00:00
Narayan Kamath
2a1a308f3b
am 70a4a6a3
: Merge "changing the rules following java package renaming for external/apache-harmony."
...
* commit '70a4a6a3323885b0f2701b9a6fe3d2eea2152a23':
changing the rules following java package renaming for external/apache-harmony.
2014-02-17 12:30:59 +00:00
Narayan Kamath
35513f4c92
am d4dc88b0
: Merge "Adding apache-harmony to cts."
...
* commit 'd4dc88b0f5be3670187f2fe3bb659aaeec032d3a':
Adding apache-harmony to cts.
2014-02-17 12:30:58 +00:00
Narayan Kamath
6b83542627
am 92e99b12
: Merge "add jsr166 tests to cts. Bug: 10390711"
...
* commit '92e99b128d170b28972ac3910090734e803c93e5':
add jsr166 tests to cts. Bug: 10390711
2014-02-17 12:30:58 +00:00
Narayan Kamath
2bea94bac7
Merge "Fix up android.core CTS tests."
2014-02-17 12:25:26 +00:00
Narayan Kamath
70a4a6a332
Merge "changing the rules following java package renaming for external/apache-harmony."
2014-02-17 12:25:24 +00:00
Narayan Kamath
d4dc88b0f5
Merge "Adding apache-harmony to cts."
2014-02-17 12:25:21 +00:00
Narayan Kamath
92e99b128d
Merge "add jsr166 tests to cts. Bug: 10390711"
2014-02-17 12:25:19 +00:00
Narayan Kamath
ba0b0e71ae
Fix up android.core CTS tests.
...
Fix several wrongly configured tests that were either
looking for tests in the wrong jar (apache-harmony-tests
instead of core-tests) or using the wrong prefix.
Also, this change creates subsets of the harmony tests based
on subpackage names (java.net, java.io, java.nio etc.) instead
of the earlier harmony groupings.
Change-Id: Iea0e20d23512611d1aac92b2f8219031b6396c77
2014-02-17 12:09:24 +00:00
Tsu Chiang Chuang
7d42d0f251
changing the rules following java package renaming for
...
external/apache-harmony.
(cherry picked from commit 27b4b5ffe12b179fc0d24747f9ead2d5f52c871a)
Change-Id: Ia5a7b2d401f23dfdc556ef1982efd441ed1d1ae2
2014-02-17 12:09:13 +00:00
Tsu Chiang Chuang
9c648df491
Adding apache-harmony to cts.
...
(cherry-picked from commit 5fef52e9c986184796ff1e5fe54390614ba318a6)
Change-Id: I9a6595f5e8bc30654a062e0917d3ecd3ba28ebc7
2014-02-17 12:08:59 +00:00
Tsu Chiang Chuang
4e189b08f3
add jsr166 tests to cts.
...
Bug: 10390711
Change-Id: I512770e98f61995fc33043d35562dc3b213a4930
2014-02-17 12:08:39 +00:00
Dirk Dougherty
5f977bb9e1
am bdaf9012
: am 98756f3b
: am 8a56079c
: am 5c92d966
: am 541b4941
: New temporary templates set for dynamic content support.
...
* commit 'bdaf90122ae93469175304be6bee4ad0f0375639':
New temporary templates set for dynamic content support.
2014-02-15 18:25:38 +00:00
Dirk Dougherty
bdaf90122a
am 98756f3b
: am 8a56079c
: am 5c92d966
: am 541b4941
: New temporary templates set for dynamic content support.
...
* commit '98756f3b7e16558ae4e17891237163ab8a23c462':
New temporary templates set for dynamic content support.
2014-02-15 18:20:12 +00:00
Dirk Dougherty
98756f3b7e
am 8a56079c
: am 5c92d966
: am 541b4941
: New temporary templates set for dynamic content support.
...
* commit '8a56079c74765afa405a96bd025f2bddac4e17b6':
New temporary templates set for dynamic content support.
2014-02-15 18:16:51 +00:00
Dirk Dougherty
8a56079c74
am 5c92d966
: am 541b4941
: New temporary templates set for dynamic content support.
...
* commit '5c92d966076b28024a9efd6c8456445e207748f1':
New temporary templates set for dynamic content support.
2014-02-15 18:14:37 +00:00
Dirk Dougherty
5c92d96607
am 541b4941
: New temporary templates set for dynamic content support.
...
* commit '541b494103857da31505ba745b0da5bdbe0499b9':
New temporary templates set for dynamic content support.
2014-02-15 18:12:08 +00:00
Dirk Dougherty
541b494103
New temporary templates set for dynamic content support.
...
Change-Id: I066e43cdebaf66c0d8b5e3622a286dc2c88c47b5
2014-02-14 18:31:53 -08:00
Stephen Hines
4dcf3dbf08
Merge "Switch to Clang 3.4 prebuilts."
2014-02-15 00:21:51 +00:00
Ying Wang
c86ea72cbf
am 595e1f46
: am 872d3c2c
: Merge "gettop: fix symlink detection"
...
* commit '595e1f46919f79e23f4b09d50de99ef291a9821a':
gettop: fix symlink detection
2014-02-14 23:41:20 +00:00
Stephen Hines
34c6ac77c2
am c4206df9
: am 051e28fe
: Merge "Fix incorrect x86 build rules."
...
* commit 'c4206df9e8b59d1e9e948033e02ec08620f31c8b':
Fix incorrect x86 build rules.
2014-02-14 23:41:20 +00:00
Ying Wang
595e1f4691
am 872d3c2c
: Merge "gettop: fix symlink detection"
...
* commit '872d3c2c6a07e4f1c171439449727a870dfaa59d':
gettop: fix symlink detection
2014-02-14 23:08:08 +00:00
Stephen Hines
c4206df9e8
am 051e28fe
: Merge "Fix incorrect x86 build rules."
...
* commit '051e28fe2128a284ec7987f903f02b9f5826391b':
Fix incorrect x86 build rules.
2014-02-14 23:07:59 +00:00
Ying Wang
872d3c2c6a
Merge "gettop: fix symlink detection"
2014-02-14 21:20:17 +00:00
Stephen Hines
051e28fe21
Merge "Fix incorrect x86 build rules."
2014-02-14 20:32:30 +00:00
Torne (Richard Coles)
f93beb2167
Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
2014-02-14 10:49:32 +00:00
Stephen Hines
28256de43b
Switch to Clang 3.4 prebuilts.
...
Change-Id: Ic8b0a7db4bb8ea96013e6b8c2f1fcdb80b6a7b03
2014-02-14 00:56:50 -08:00
Ying Wang
d3579f4ee0
Merge "Add a dummy build recipe for the proto generated header files"
2014-02-14 02:29:52 +00:00
Ying Wang
8c556594bf
Add a dummy build recipe for the proto generated header files
...
This fixed issue that gnumake skip updating the cpp file that includes
the generated header file when the .proto file gets updated.
For example:
Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule
that generates b.pb.cc, and though we have dependency "b.pb.h :
b.pb.cc", but we don't have build recipe for that rule.
Gmake stupidly thinks that b.pb.h must not be updated in that case so
it skips all targets that depends on b.pb.h!
With the dumy build recipe, gmake now doesn't skip the depedent targets.
Bug: 13009798
Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c
2014-02-13 18:04:00 -08:00
Colin Cross
349e915daf
am cb241895
: am a9baf879
: Merge "fix build"
...
* commit 'cb241895046e9827801811d8455be120ff2ea9f2':
fix build
2014-02-14 00:58:46 +00:00
Colin Cross
b01233f26f
am a0eb50ac
: resolved conflicts for merge of 2fbe5018
to klp-modular-dev-plus-aosp
...
* commit 'a0eb50accabe83b18bd3fe3b9d6417a4718af9e2':
add linker64 and debuggerd64 to all products
2014-02-14 00:51:53 +00:00
Colin Cross
cb24189504
am a9baf879
: Merge "fix build"
...
* commit 'a9baf8795e5d770a2e0ee7da22781701842932bd':
fix build
2014-02-14 00:50:00 +00:00
Colin Cross
a9baf8795e
Merge "fix build"
2014-02-14 00:44:30 +00:00
Colin Cross
3a14c87520
fix build
...
Include prebuilt_internal.mk for host builds.
Change-Id: I750d6f71b3a2c67b11536babb8b39060005f4ff4
2014-02-13 16:41:52 -08:00
Colin Cross
59320c1374
am 9b2077d4
: am 3bbaab31
: Merge changes I2514f66f,I71fed98d
...
* commit '9b2077d4b969e9f8598242915f094552c5d78ad5':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
2014-02-14 00:35:33 +00:00
Colin Cross
a0eb50acca
resolved conflicts for merge of 2fbe5018
to klp-modular-dev-plus-aosp
...
Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
2014-02-13 16:32:48 -08:00
Colin Cross
9b2077d4b9
am 3bbaab31
: Merge changes I2514f66f,I71fed98d
...
* commit '3bbaab31069045aea9ae33c1d995640e56182a82':
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
2014-02-14 00:28:53 +00:00
Colin Cross
2fbe5018f9
Merge "add linker64 and debuggerd64 to all products"
2014-02-14 00:24:47 +00:00
Colin Cross
3bbaab3106
Merge changes I2514f66f,I71fed98d
...
* changes:
support LOCAL_MODULE_TARGET_ARCH for prebuilts
Add generated sources dir to the default include path
2014-02-14 00:24:16 +00:00
Colin Cross
381435353d
add linker64 and debuggerd64 to all products
...
Add linker64 and debuggerd64 to embedded.mk. They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.
Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
2014-02-13 16:23:33 -08:00
Ying Wang
1fd8265d1a
am 1e8fec5b
: am e2f06adb
: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
...
* commit '1e8fec5baea381604a2bf197bfb091eeb7aa36ef':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
2014-02-14 00:15:42 +00:00
Colin Cross
25d84aa38f
am 4048cf3a
: am 7ea5cd95
: Merge "don\'t use LOCAL_*_arch for host builds"
...
* commit '4048cf3a70dd6405f7ff08b8a3d714d1a7b7d446':
don't use LOCAL_*_arch for host builds
2014-02-14 00:15:42 +00:00
Ying Wang
1e8fec5bae
am e2f06adb
: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build."
...
* commit 'e2f06adb8873ede16f829690b4dbab07b8121aa8':
Don't check the existence for the 64-bit modules for 32-bit SDK build.
2014-02-14 00:09:58 +00:00
Colin Cross
4048cf3a70
am 7ea5cd95
: Merge "don\'t use LOCAL_*_arch for host builds"
...
* commit '7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f':
don't use LOCAL_*_arch for host builds
2014-02-14 00:09:57 +00:00
Ying Wang
e2f06adb88
Merge "Don't check the existence for the 64-bit modules for 32-bit SDK build."
2014-02-14 00:03:13 +00:00