Commit graph

15277 commits

Author SHA1 Message Date
Ying Wang
ae5a1e1447 Try to catch more misuse of $(my-dir).
(cherry picked from commit 79e8319b2e)

Change-Id: I779af79c83de2ad1944269dd5bd31d65ff844064
2014-03-18 15:11:44 -07:00
Greg Hackmann
b5169b4d75 am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"
* commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e':
  HACK: disable emulator on x86_64
2014-03-18 19:29:01 +00:00
Greg Hackmann
5a4183f391 am 267afcde: Merge "HACK: disable emulator on x86_64"
* commit '267afcdefe3a6da9b72a9c70d238abb00be69949':
  HACK: disable emulator on x86_64
2014-03-18 12:25:45 -07:00
Greg Hackmann
267afcdefe Merge "HACK: disable emulator on x86_64" 2014-03-18 19:21:49 +00:00
Ying Wang
8824386987 am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
* commit '5462f7f953915bd345a58b17977e79e6405b56d0':
  Remove unused LOCAL_ASSET_FILES.
2014-03-18 18:44:05 +00:00
Ying Wang
5462f7f953 am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
* commit '255ea2bdc45673b7d08809f4495f060b00006c6e':
  Remove unused LOCAL_ASSET_FILES.
2014-03-18 11:38:25 -07:00
Ying Wang
255ea2bdc4 Merge "Remove unused LOCAL_ASSET_FILES." 2014-03-18 18:32:05 +00:00
Ying Wang
594f2a4261 Remove unused LOCAL_ASSET_FILES.
Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a
2014-03-18 11:31:09 -07:00
Greg Hackmann
4562c5bcb3 HACK: disable emulator on x86_64
The build system and qemu disagree about where the x86_64 kernel should
live; disable the emulator until that's resolved

Change-Id: Ia7a2745ee8f3f4211ce39f8d851d5d860acbf62b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-18 11:13:37 -07:00
Scott Main
1cc00e3116 am bb79f9d2: am b7b49711: add some css to support android wear sub-site
* commit 'bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82':
  add some css to support android wear sub-site
2014-03-18 12:38:11 +00:00
Scott Main
bb79f9d2a5 am b7b49711: add some css to support android wear sub-site
* commit 'b7b497115fb19d17a3e5de20646a5eac759c0095':
  add some css to support android wear sub-site
2014-03-18 12:35:42 +00:00
Scott Main
b7b497115f add some css to support android wear sub-site
Change-Id: Ibce2c596219fb86f433075c88a0af9d0cc1007b3
2014-03-18 05:32:26 -07:00
Andrew Hsieh
23371f350a am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
* commit 'd14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
2014-03-18 00:09:32 +00:00
Andrew Hsieh
d14f3cc7bc am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
* commit '5384c187871b1ede992d7de2b4299be45d0e0030':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
2014-03-17 17:07:44 -07:00
Andrew Hsieh
5384c18787 Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared" 2014-03-18 00:04:26 +00:00
Andrew Hsieh
73d800e519 Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Add llvm libc++ static and shared libraries

Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
2014-03-17 20:30:45 +08:00
Ying Wang
8196f6159e am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
  Don't modify LOCAL_STRIP_MODULE
2014-03-16 20:08:32 +00:00
Ying Wang
a660d06eeb am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
* commit '1cda15d3234a502ba7332b56a7bbecca228731cf':
  Don't modify LOCAL_STRIP_MODULE
2014-03-16 13:04:59 -07:00
Ying Wang
1cda15d323 Merge "Don't modify LOCAL_STRIP_MODULE" 2014-03-16 20:02:56 +00:00
Ying Wang
e1889af2d5 Don't modify LOCAL_STRIP_MODULE
LOCAL_STRIP_MODULE will be reused in multilib build.

Change-Id: I3512efb360c7eaafad02859723ab4368778effed
2014-03-16 12:43:49 -07:00
Colin Cross
f6da0820b3 am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
  Work in progress to enable build system support for Clang.
2014-03-16 00:00:20 +00:00
Colin Cross
6e92ade0a6 am db24577b: Merge "Work in progress to enable build system support for Clang."
* commit 'db24577bbd0ccc60be19791290d367e2efb5583e':
  Work in progress to enable build system support for Clang.
2014-03-15 16:56:40 -07:00
Colin Cross
db24577bbd Merge "Work in progress to enable build system support for Clang." 2014-03-15 23:54:03 +00:00
Tim Murray
b5f333bbef Work in progress to enable build system support for Clang.
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
2014-03-14 00:39:03 -07:00
Dianne Hackborn
6668799e7b resolved conflicts for merge of 264d4001 to klp-dev-plus-aosp
Change-Id: Ib95e5f6a6a5a613395a13a9df3d283348576d241
2014-03-13 17:35:26 -07:00
Andrew Hsieh
2fceaccc30 am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit 'de8edc8a35e5a53c6f1f8e5db099c28691319585':
  Fix HOST_TOOLCHAIN_PREFIX
2014-03-14 00:26:58 +00:00
Andrew Hsieh
de8edc8a35 am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '933e8940d00745413ae1e9d0e76714feecf9086a':
  Fix HOST_TOOLCHAIN_PREFIX
2014-03-13 17:23:37 -07:00
Andrew Hsieh
933e8940d0 Merge "Fix HOST_TOOLCHAIN_PREFIX" 2014-03-14 00:19:19 +00:00
Narayan Kamath
d34f629e24 am 237f5414: (-s ours) 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 23:18:37 +00:00
Colin Cross
7bebf57094 Merge topic 'klp-dev-plus-aosp-fix-skips' into klp-dev-plus-aosp
* changes:
  Revert "Remove external/chromium from the 64 bit blacklist."
  Remove external/chromium from the 64 bit blacklist.
  OProfile is no longer compiled now.
  Amend 64 bit blacklist.
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
  Remove external/tcpdump from 64-bit build blacklist.
  oprofile/daemon doesn't build for x86_64.
  Remove external/wpa_supplicant_8 and external/android-clat
  Take libcore off the LP64 blacklist.
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures
2014-03-13 23:16:57 +00:00
Narayan Kamath
53e06394da am 70916972: (-s ours) am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '709169725a34836b3f388526aee714f070f20103':
  Remove external/chromium from the 64 bit blacklist.
2014-03-13 23:07:47 +00:00
Narayan Kamath
dc8541686c Revert "Remove external/chromium from the 64 bit blacklist."
This reverts commit 27bf51144a.

Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
2014-03-13 11:26:26 -07:00
Narayan Kamath
c88d174010 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-13 11:26:26 -07:00
Ben Cheng
b0f8c44069 OProfile is no longer compiled now.
BUG: 13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
2014-03-13 11:26:26 -07:00
Narayan Kamath
bde97f477b Amend 64 bit blacklist.
- external/skia now builds on arm64, frameworks/base/libs/hwui
  depends on it.
- external/bluetooth/bluedroid builds on 64 bit, though there
  isn't any obvious way to test it without real hardware.
- frameworks/ml now builds, as does external/srec
- frameworks/opt, frameworks/ex and frameworks/wilhelm don't
  build because of their dependency on frameworks/av.

frameworks/av should probably be dropped out of the blacklist
and replaced by individual markers on targets that we want
for 64 bit (we don't want all of them for arm64).

Change-Id: I9735108840fcba21ac8918bedf0d6de8989de086
2014-03-13 11:26:26 -07:00
JP Abgrall
7e09b998c3 DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
This enables tcpdump for 64bit builds.

This reverts commit 24f99bd4b3.

Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
2014-03-13 11:26:26 -07:00
JP Abgrall
470125849d DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
This is until aosp gets the latest libpcap+tcpdump currently only on internal.

This reverts commit 5c68e265ac.

Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
2014-03-13 11:26:26 -07:00
Ying Wang
f3ba9484b5 Remove external/tcpdump from 64-bit build blacklist.
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
2014-03-13 11:26:26 -07:00
Elliott Hughes
1c71a43aef oprofile/daemon doesn't build for x86_64.
We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.

Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356
2014-03-13 11:26:26 -07:00
Ying Wang
579ea43d87 Remove external/wpa_supplicant_8 and external/android-clat
from 64_bit_blacklist.mk.
They now build fine for 64-bit.

Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
2014-03-13 11:26:26 -07:00
Elliott Hughes
7813000d49 Take libcore off the LP64 blacklist.
Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
2014-03-13 11:26:26 -07:00
Colin Cross
9bdcdff615 HACK: add 64-bit directory blacklist
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-03-13 11:26:26 -07:00
Colin Cross
c92f1407a1 add support for module supported or unsupported target architectures
Add four new variables for module makefiles:

LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for
one or more architectures.  Any architecture not in the list will be
not attempt to build the module.  The expected use case is prebuilts
that are only suitable for a single architecture, or modules like llvm
that need per-architecture support.

LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be
built for one or more architectures.

LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN
are the same, but warn that the arch is not supported, which is useful
for modules that are critical but not yet working.

The logic for whether or not to build an architecture is fairly
complicated, so this patch consolidates it into module_arch_supported.mk

Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
2014-03-13 11:26:04 -07:00
Dmitriy Ivanov
96ad54d132 am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
  Add TARGET_2ND_ARCH to dumpvar
2014-03-13 15:54:41 +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
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
Ying Wang
895520a782 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-13 01:55:11 +00:00