Hui Shu
2ecd9fc969
Merge "Fix another build break."
2014-03-13 23:35:42 +00:00
Hui Shu
ec21c58574
Fix another build break.
...
The doclava build does not need to depend on the intermedidate
removed.txt. It depends on public_api.txt. Removed.txt is generated
along with public_api.txt by doclava.
BUG: b/11293324
Change-Id: Ia5ea675bbfb15b81ce6ae81cf34c608e83676ca1
2014-03-13 16:31:21 -07:00
Narayan Kamath
70df4dc56a
am 2c852c33: am f262d87f: am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
...
* commit '2c852c3399d86ae2f25fe4205d8e4bd4a3ce971f':
Revert "Remove external/chromium from the 64 bit blacklist."
2014-03-13 23:11:49 +00:00
Hui Shu
f6a9b877b5
Fix the build break.
...
BUG: b/11293324
Should find the removed.txt under frameworks/base/api/
Change-Id: Icd937cb8c1a7f23dba35c440045cea54e2a8242e
2014-03-13 15:40:55 -07:00
Hui Shu
749aee5f5e
Merge "Add removed.txt for doclava api consistency check"
2014-03-13 22:11:23 +00:00
Narayan Kamath
a813b73579
am e00d0e7c: am f6869e25: am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."
...
* commit 'e00d0e7c6a5b63489faa3e8e9de6285b11f7b8e9':
Remove external/chromium from the 64 bit blacklist.
2014-03-13 21:20:36 +00:00
Narayan Kamath
2c852c3399
am f262d87f: am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
...
* commit 'f262d87f0163222fbdb0cb99cd21f4646d2c6f4f':
Revert "Remove external/chromium from the 64 bit blacklist."
2014-03-13 09:40:11 +00:00
Narayan Kamath
f262d87f01
am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
...
* commit '237f5414ebf38e1386307679947641f72865fc38':
Revert "Remove external/chromium from the 64 bit blacklist."
2014-03-13 09:33:58 +00:00
Narayan Kamath
237f5414eb
am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
...
* commit 'cc8d6dab9a3ae140ed99d3f3373e72b54811f210':
Revert "Remove external/chromium from the 64 bit blacklist."
2014-03-13 02:31:33 -07:00
Narayan Kamath
cc8d6dab9a
Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
2014-03-13 09:29:52 +00:00
Narayan Kamath
c00ab8e012
Revert "Remove external/chromium from the 64 bit blacklist."
...
This reverts commit 27bf51144a
.
Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
2014-03-13 09:29:22 +00:00
Narayan Kamath
e00d0e7c6a
am f6869e25: am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."
...
* commit 'f6869e25c9117d20a9a1f315d5784068e4d7ea99':
Remove external/chromium from the 64 bit blacklist.
2014-03-13 09:28:33 +00:00
Narayan Kamath
f6869e25c9
am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."
...
* commit '709169725a34836b3f388526aee714f070f20103':
Remove external/chromium from the 64 bit blacklist.
2014-03-13 09:18:00 +00:00
Narayan Kamath
709169725a
am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."
...
* commit '252496247f31ee06d8c948886fd2f3a36ccd021e':
Remove external/chromium from the 64 bit blacklist.
2014-03-13 02:08:35 -07:00
Narayan Kamath
252496247f
Merge "Remove external/chromium from the 64 bit blacklist."
2014-03-13 09:05:32 +00:00
Dmitriy Ivanov
b1758f2376
am abfea0ac: am 7ba6258a: am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
...
* commit 'abfea0ac92964024996dc487028f1b4896e1bdf0':
Add TARGET_2ND_ARCH to dumpvar
2014-03-12 22:57:47 +00:00
Dmitriy Ivanov
abfea0ac92
am 7ba6258a: am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
...
* commit '7ba6258a7b4206c97da2dce6719625cf4cbd5b96':
Add TARGET_2ND_ARCH to dumpvar
2014-03-12 18:53:04 +00:00
Dmitriy Ivanov
7ba6258a7b
am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
...
* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
Add TARGET_2ND_ARCH to dumpvar
2014-03-12 18:49:19 +00:00
Dmitriy Ivanov
d842e6d6c3
am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
...
* commit 'c62d6f7622f567ba9a0acf54a80d118f85e741b4':
Add TARGET_2ND_ARCH to dumpvar
2014-03-12 11:46:05 -07:00
Dmitriy Ivanov
c62d6f7622
Merge "Add TARGET_2ND_ARCH to dumpvar"
2014-03-12 18:40:43 +00:00
Dmitriy Ivanov
d5cd1e2ecf
Add TARGET_2ND_ARCH to dumpvar
...
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
2014-03-12 11:13:41 -07:00
Narayan Kamath
27bf51144a
Remove external/chromium from the 64 bit blacklist.
...
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.
This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.
Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
2014-03-12 14:43:38 +00:00
Andrew Hsieh
d7ef5b3ada
Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
2014-03-12 01:49:34 +00:00
Andy McFadden
68e1654aed
Remove "screenshot"
...
Remove the old "screenshot" utility, which has been replaced
by "screencap".
Change-Id: I5bad1fdad308339e4a16ce92f2a65e2437b1be65
2014-03-11 13:51:57 -07:00
Ying Wang
df925cefc1
am f91a014f: am 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
...
* commit 'f91a014f6f2c176f6e1f99cb3bb90d707e0be31c':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
2014-03-11 02:15:11 +00:00
Ying Wang
f91a014f6f
am 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
...
* commit '0a196075eeddef89a5cc8b679adde7c0791031bf':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
2014-03-11 02:11:29 +00:00
Ying Wang
0a196075ee
am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
...
* commit '446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
2014-03-11 02:08:45 +00:00
Ying Wang
446f00c9e1
am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
...
* commit 'ce156811797d7594b712120c5d969e329d70b1e3':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
2014-03-10 19:05:27 -07:00
Ying Wang
ce15681179
Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
2014-03-11 02:03:07 +00:00
Ying Wang
ba8b377d89
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
...
Still keep WITHOUT_CLANG, which enables both.
Bug: 13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
2014-03-10 18:59:12 -07:00
Ian Rogers
67d675af0e
am d5cd41fe: am 95739176: am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
...
* commit 'd5cd41fe6d9d140e84703e87cec1f83660e568e3':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
2014-03-11 00:37:50 +00:00
Ian Rogers
d5cd41fe6d
am 95739176: am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
...
* commit '95739176994c3b28fc7fdd3e677de500cdd66b8c':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
2014-03-11 00:04:52 +00:00
Ian Rogers
9573917699
am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
...
* commit '21060b30993b975084ea7a7c35a6df23cf0e5ea7':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
2014-03-11 00:01:57 +00:00
Ian Rogers
21060b3099
am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
...
* commit '775d15e001d48d72a1b76982b1b5faa1eb37158f':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
2014-03-10 16:59:07 -07:00
Ian Rogers
775d15e001
Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
2014-03-10 23:55:32 +00:00
Ian Rogers
aa54033b46
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
...
Change-Id: I945128b3087b28f62467c7123b759e3514027574
2014-03-10 16:49:41 -07:00
Ian Rogers
17fe9e3000
am 17536801: am e25c0b25: am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
...
* commit '17536801ea179360da3ba2886dfc48dda392d28a':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-10 23:42:20 +00:00
Ian Rogers
17536801ea
am e25c0b25: am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
...
* commit 'e25c0b259917b31bfe642b6e4aa08de06068db7a':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-10 23:39:12 +00:00
Ian Rogers
e25c0b2599
am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
...
* commit 'bc39fd5cab47388797ee7638920766e91fe0b100':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-10 23:37:13 +00:00
Ian Rogers
bc39fd5cab
am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
...
* commit 'f1e697be5e433818071a817af0b673cba8e87795':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-10 16:33:44 -07:00
Ian Rogers
f1e697be5e
Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
2014-03-10 23:29:25 +00:00
Ian Rogers
c61a9425cd
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
This reverts commit 668427c941
.
Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
2014-03-10 23:27:01 +00:00
Ian Rogers
368790a734
am 4d16757b: am 848361f9: am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
* commit '4d16757b201003cd25b0b27a717b1bc7c32a6dd8':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
2014-03-10 22:58:18 +00:00
Ian Rogers
4d16757b20
am 848361f9: am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
* commit '848361f97e84aa5ef6a05fc38126734fb5728e84':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
2014-03-10 22:54:53 +00:00
Ian Rogers
848361f97e
am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
* commit 'a520bfbeb65b307da42abb079911311096fef20c':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
2014-03-10 22:51:08 +00:00
Ian Rogers
a520bfbeb6
am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
* commit '4783dc7ab509b7099d2de83f863a9799ce67659e':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
2014-03-10 15:48:25 -07:00
Ian Rogers
4783dc7ab5
Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-10 22:44:50 +00:00
Ian Rogers
668427c941
Define __STDC_LIMIT_MACROS globally to work around host build differences.
...
Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
2014-03-10 15:30:39 -07:00
Ying Wang
b5e1864817
am 1409fb95: am 76704158: am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version"
...
* commit '1409fb9511dab926d358a7a6d850981bb53f366f':
jdk error message should not mention the version
2014-03-10 19:34:33 +00:00
Ying Wang
1409fb9511
am 76704158: am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version"
...
* commit '7670415852747814f0a6b3480bf9a499c1fd5e75':
jdk error message should not mention the version
2014-03-10 19:31:28 +00:00