OSDN Git Service

android-x86/build.git
10 years agoA few other removals for the 64 bit blacklist.
Narayan Kamath [Wed, 19 Mar 2014 09:04:28 +0000 (09:04 +0000)]
A few other removals for the 64 bit blacklist.

- external/chromium now compiles
- stagefright codecs now compile.
- frameworks/base now compiles.

Change-Id: I1226b79cd3e0b5e2fd786bb506e022b47fe5e264

10 years agoMerge "Remove arm64 clang build warning"
Ying Wang [Tue, 18 Mar 2014 22:58:49 +0000 (22:58 +0000)]
Merge "Remove arm64 clang build warning"

10 years agoRemove arm64 clang build warning
Ying Wang [Tue, 18 Mar 2014 22:12:29 +0000 (15:12 -0700)]
Remove arm64 clang build warning

Now we have enabled arm64 clang.
This change remvoed arm64 clang build warning and cleaned the
arm64 unknow c flags.

Change-Id: Ia583a78c6d364e603ff09df423aa34a6e03d0b9b

10 years agoMerge "Don't blacklist all of frameworks/av for 64-bit"
Glenn Kasten [Tue, 18 Mar 2014 21:45:12 +0000 (21:45 +0000)]
Merge "Don't blacklist all of frameworks/av for 64-bit"

10 years agoMerge "HACK: disable emulator on x86_64"
Greg Hackmann [Tue, 18 Mar 2014 19:21:48 +0000 (19:21 +0000)]
Merge "HACK: disable emulator on x86_64"

10 years agoDon't blacklist all of frameworks/av for 64-bit
Glenn Kasten [Wed, 12 Mar 2014 16:00:15 +0000 (09:00 -0700)]
Don't blacklist all of frameworks/av for 64-bit

Change-Id: Ic2db99b1b577e3355c50982af5068bce32edf4ba

10 years agoMerge "Remove unused LOCAL_ASSET_FILES."
Ying Wang [Tue, 18 Mar 2014 18:32:05 +0000 (18:32 +0000)]
Merge "Remove unused LOCAL_ASSET_FILES."

10 years agoRemove unused LOCAL_ASSET_FILES.
Ying Wang [Tue, 18 Mar 2014 18:31:09 +0000 (11:31 -0700)]
Remove unused LOCAL_ASSET_FILES.

Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a

10 years agoHACK: disable emulator on x86_64
Greg Hackmann [Tue, 18 Mar 2014 18:11:07 +0000 (11:11 -0700)]
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>
10 years agoMerge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
Andrew Hsieh [Tue, 18 Mar 2014 00:04:25 +0000 (00:04 +0000)]
Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"

10 years agoAdd LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Andrew Hsieh [Tue, 4 Mar 2014 09:11:52 +0000 (17:11 +0800)]
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared

Add llvm libc++ static and shared libraries

Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9

10 years agoMerge "Don't modify LOCAL_STRIP_MODULE"
Ying Wang [Sun, 16 Mar 2014 20:02:56 +0000 (20:02 +0000)]
Merge "Don't modify LOCAL_STRIP_MODULE"

10 years agoDon't modify LOCAL_STRIP_MODULE
Ying Wang [Sun, 16 Mar 2014 19:43:49 +0000 (12:43 -0700)]
Don't modify LOCAL_STRIP_MODULE

LOCAL_STRIP_MODULE will be reused in multilib build.

Change-Id: I3512efb360c7eaafad02859723ab4368778effed

10 years agoMerge "Work in progress to enable build system support for Clang."
Colin Cross [Sat, 15 Mar 2014 23:54:03 +0000 (23:54 +0000)]
Merge "Work in progress to enable build system support for Clang."

10 years agoWork in progress to enable build system support for Clang.
Tim Murray [Fri, 7 Mar 2014 21:18:44 +0000 (13:18 -0800)]
Work in progress to enable build system support for Clang.

Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c

10 years agoMerge "Fix HOST_TOOLCHAIN_PREFIX"
Andrew Hsieh [Fri, 14 Mar 2014 00:19:18 +0000 (00:19 +0000)]
Merge "Fix HOST_TOOLCHAIN_PREFIX"

10 years agoMerge "Revert "Remove external/chromium from the 64 bit blacklist.""
Narayan Kamath [Thu, 13 Mar 2014 09:29:52 +0000 (09:29 +0000)]
Merge "Revert "Remove external/chromium from the 64 bit blacklist.""

10 years agoRevert "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:29:22 +0000 (09:29 +0000)]
Revert "Remove external/chromium from the 64 bit blacklist."

This reverts commit 27bf51144af3513605cff421beb39a556599eb42.

Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c

10 years agoMerge "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:05:30 +0000 (09:05 +0000)]
Merge "Remove external/chromium from the 64 bit blacklist."

10 years agoMerge "Add TARGET_2ND_ARCH to dumpvar"
Dmitriy Ivanov [Wed, 12 Mar 2014 18:40:42 +0000 (18:40 +0000)]
Merge "Add TARGET_2ND_ARCH to dumpvar"

10 years agoAdd TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:13:41 +0000 (11:13 -0700)]
Add TARGET_2ND_ARCH to dumpvar

Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096

10 years agoRemove external/chromium from the 64 bit blacklist.
Narayan Kamath [Wed, 12 Mar 2014 14:42:07 +0000 (14:42 +0000)]
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

10 years agoFix HOST_TOOLCHAIN_PREFIX
Andrew Hsieh [Wed, 12 Mar 2014 11:27:59 +0000 (19:27 +0800)]
Fix HOST_TOOLCHAIN_PREFIX

Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format.  Fix it so we can try out new host toolchain, eg.

  HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make

Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40

10 years agoMerge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
Ying Wang [Tue, 11 Mar 2014 02:03:07 +0000 (02:03 +0000)]
Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"

10 years agoSplit WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 01:23:08 +0000 (18:23 -0700)]
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG

Still keep WITHOUT_CLANG, which enables both.

Bug: 13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830

10 years agoMerge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:55:32 +0000 (23:55 +0000)]
Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."

10 years agoDefine __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 23:49:41 +0000 (16:49 -0700)]
Define __STDC_CONSTANT_MACROS globally to work around host build differences.

Change-Id: I945128b3087b28f62467c7123b759e3514027574

10 years agoMerge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differen...
Ian Rogers [Mon, 10 Mar 2014 23:29:25 +0000 (23:29 +0000)]
Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""

10 years agoRevert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:27:01 +0000 (23:27 +0000)]
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."

This reverts commit 668427c941bd88cacdf24d0562e6b68eb93038a1.

Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802

10 years agoMerge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 22:44:49 +0000 (22:44 +0000)]
Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."

10 years agoDefine __STDC_LIMIT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 22:30:39 +0000 (15:30 -0700)]
Define __STDC_LIMIT_MACROS globally to work around host build differences.

Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd

10 years agoMerge "jdk error message should not mention the version"
Ying Wang [Mon, 10 Mar 2014 19:25:58 +0000 (19:25 +0000)]
Merge "jdk error message should not mention the version"

10 years agojdk error message should not mention the version
Chris Wren [Fri, 7 Mar 2014 19:51:56 +0000 (14:51 -0500)]
jdk error message should not mention the version

the version is checked elsewhere

Bug: 13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404

10 years agoMerge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
Clay Murphy [Mon, 10 Mar 2014 18:47:17 +0000 (18:47 +0000)]
Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"

10 years agoMerge "OProfile is no longer compiled now."
Ben Cheng [Fri, 7 Mar 2014 16:49:39 +0000 (16:49 +0000)]
Merge "OProfile is no longer compiled now."

10 years agoOProfile is no longer compiled now.
Ben Cheng [Wed, 5 Mar 2014 22:31:34 +0000 (14:31 -0800)]
OProfile is no longer compiled now.

BUG: 13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7

10 years agoDocs: replacing analytics ID from D.A.C.
Clay Murphy [Wed, 6 Nov 2013 22:03:41 +0000 (14:03 -0800)]
Docs: replacing analytics ID from D.A.C.
Bug: 11476435

Change-Id: I834646e6a618709fe21afa5958bd28f822991e29

10 years agoMerge "Do not remove the generated .hpp file from yacc."
Nicolas Geoffray [Wed, 5 Mar 2014 14:09:26 +0000 (14:09 +0000)]
Merge "Do not remove the generated .hpp file from yacc."

10 years agoMerge "Remove host-prefix command line argument to dex2oat."
Nicolas Geoffray [Tue, 4 Mar 2014 17:20:36 +0000 (17:20 +0000)]
Merge "Remove host-prefix command line argument to dex2oat."

10 years agoRemove host-prefix command line argument to dex2oat.
Nicolas Geoffray [Tue, 4 Mar 2014 17:06:40 +0000 (17:06 +0000)]
Remove host-prefix command line argument to dex2oat.

Change-Id: If4a962976d1e8a283d6b682112a1b12d328d8dbb

10 years agoDo not remove the generated .hpp file from yacc.
Nicolas Geoffray [Tue, 4 Mar 2014 14:48:55 +0000 (14:48 +0000)]
Do not remove the generated .hpp file from yacc.

Depending on the file extension of the generated C++ file,
bison will generate a #include of a .h or .hpp. So both files
must be kept in the generated directory.

Change-Id: Id0aac7f407bdc69c7f5012c0d021761b0fceb427

10 years agoMerge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
Andrew Hsieh [Tue, 4 Mar 2014 01:06:04 +0000 (01:06 +0000)]
Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"

10 years agoMerge "Add external/google-fonts/*/fonts.mk."
Victoria Lease [Mon, 3 Mar 2014 23:38:33 +0000 (23:38 +0000)]
Merge "Add external/google-fonts/*/fonts.mk."

10 years agoMerge "Extend YACC and LEX handling to .yy and .ll files."
Nicolas Geoffray [Mon, 3 Mar 2014 18:03:29 +0000 (18:03 +0000)]
Merge "Extend YACC and LEX handling to .yy and .ll files."

10 years agoMerge "Add usage comment to explain how to limit modules in mmm."
Primiano Tucci [Mon, 3 Mar 2014 17:49:06 +0000 (17:49 +0000)]
Merge "Add usage comment to explain how to limit modules in mmm."

10 years agoExtend YACC and LEX handling to .yy and .ll files.
Nicolas Geoffray [Mon, 3 Mar 2014 15:57:06 +0000 (15:57 +0000)]
Extend YACC and LEX handling to .yy and .ll files.

The external mclinker project has .yy and .ll files that
require the same rules as .y and .l.

Change-Id: I2b02df9a74bac9c215f8aeb8ee2ff0d2616526ed

10 years agoMerge "Amend 64 bit blacklist."
Narayan Kamath [Mon, 3 Mar 2014 11:56:47 +0000 (11:56 +0000)]
Merge "Amend 64 bit blacklist."

10 years agoUse analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
Andrew Hsieh [Mon, 3 Mar 2014 08:53:17 +0000 (16:53 +0800)]
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer

Analyzer needed by WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK is
moved from prebuilts/clang/{linux-x86,darwin-x86}/host/3.3 to
prebuilts/misc/{linux-x86,darwin-x86}/analyzer

See https://android-review.googlesource.com/#/c/83852/

BUG=13243591

Usage:

"WITH_SYNTAX_CHECK=1 make ..." instructs build system to invoke "clang -fsyntax-only"
to utilize clang's better diagnostics before calling LOCAL_CC/LOCAL_CXX for code generation.
The compilation time is slightly longer, and the generated object file should be the same as
w/o WITH_SYNTAX_CHECK

"WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..." instructs build system to run static
analyzer via "clang --analyze" on a successful build.  If analyzer finds any issue, instruction
to open report is displayed. See http://clang-analyzer.llvm.org/scan-build.html for details.

WITH_STATIC_ANALYZER trumps WITH_SYNTAX_CHECK if both exist.  Project use lots of GCC extensions
(eg. nested function) not supported by clang may opt out by adding LOCAL_NO_STATIC_ANALYZER:=true

Change-Id: Ib3dda3ffb0fd3aaf2eadec867a966d1dd2868fb1

10 years agoAmend 64 bit blacklist.
Narayan Kamath [Fri, 28 Feb 2014 15:34:16 +0000 (15:34 +0000)]
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

10 years agoMerge "Try to catch more misuse of $(my-dir)."
Ying Wang [Sat, 1 Mar 2014 17:25:26 +0000 (17:25 +0000)]
Merge "Try to catch more misuse of $(my-dir)."

10 years agoTry to catch more misuse of $(my-dir).
Ying Wang [Sat, 1 Mar 2014 01:16:06 +0000 (17:16 -0800)]
Try to catch more misuse of $(my-dir).

Change-Id: I0c07d7115c66b30ba1383dfaa133f0cc40a33ad7

10 years agoAdd external/google-fonts/*/fonts.mk.
Victoria Lease [Fri, 28 Feb 2014 23:30:57 +0000 (15:30 -0800)]
Add external/google-fonts/*/fonts.mk.

Bug: 12384866
Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50

10 years agoMerge "Make gdbclient smarter for gdb[server] setup."
Ben Cheng [Fri, 28 Feb 2014 18:54:18 +0000 (18:54 +0000)]
Merge "Make gdbclient smarter for gdb[server] setup."

10 years agoMake gdbclient smarter for gdb[server] setup.
Ben Cheng [Tue, 25 Feb 2014 18:27:07 +0000 (10:27 -0800)]
Make gdbclient smarter for gdb[server] setup.

It can detect and support 3 different scenarios:

- 32-bit exe / 32-bit OS
- 64-bit exe / 64-bit OS
- 32-bit exe / 64-bit OS

Change-Id: I799a91277a5e2331aebf4b2f031e9a79f7ab5bb0

10 years agoMerge "Select src arch for prebuilts."
Ying Wang [Fri, 28 Feb 2014 02:27:27 +0000 (02:27 +0000)]
Merge "Select src arch for prebuilts."

10 years agoSelect src arch for prebuilts.
Ying Wang [Thu, 27 Feb 2014 22:10:53 +0000 (14:10 -0800)]
Select src arch for prebuilts.

Change-Id: I2d08f923d28d59cfef93ff0bd9893352baaee60b

10 years agoMerge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
JP Abgrall [Thu, 27 Feb 2014 18:04:35 +0000 (18:04 +0000)]
Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"

10 years agoMerge "Revert "generic_x86: toggle 64bit binder ABI""
Ying Wang [Thu, 27 Feb 2014 17:19:33 +0000 (17:19 +0000)]
Merge "Revert "generic_x86: toggle 64bit binder ABI""

10 years agoRevert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:19:13 +0000 (17:19 +0000)]
Revert "generic_x86: toggle 64bit binder ABI"

This reverts commit e2525ade32afa72c0e4fe12fc8fab939e41782e6.

Change-Id: Ibaec151084ce4f00194a5a22c4be7531710b4a9f

10 years agoMerge "build: add logd"
Mark Salyzyn [Thu, 27 Feb 2014 16:03:57 +0000 (16:03 +0000)]
Merge "build: add logd"

10 years agoDO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 04:05:14 +0000 (04:05 +0000)]
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok

This enables tcpdump for 64bit builds.

This reverts commit 24f99bd4b354789d7368cdee0c924e79e0a1517d.

Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0

10 years agoMerge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
JP Abgrall [Thu, 27 Feb 2014 02:17:11 +0000 (02:17 +0000)]
Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"

10 years agoDO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Wed, 26 Feb 2014 22:59:40 +0000 (22:59 +0000)]
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 5c68e265ac2bfeb881f9cc87c50f8b947ddbd86c.

Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e

10 years agoMerge "Include privileged apps with app zip file."
Ying Wang [Thu, 27 Feb 2014 01:25:13 +0000 (01:25 +0000)]
Merge "Include privileged apps with app zip file."

10 years agobuild: add logd
Nick Kralevich [Tue, 17 Jan 2012 21:48:32 +0000 (13:48 -0800)]
build: add logd

Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>
* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4

10 years agoMerge "Remove external/tcpdump from 64-bit build blacklist."
Ying Wang [Wed, 26 Feb 2014 22:23:46 +0000 (22:23 +0000)]
Merge "Remove external/tcpdump from 64-bit build blacklist."

10 years agoRemove external/tcpdump from 64-bit build blacklist.
Ying Wang [Wed, 26 Feb 2014 22:18:21 +0000 (14:18 -0800)]
Remove external/tcpdump from 64-bit build blacklist.

Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097

10 years agoMerge "Add policy for MIPS emulator, fix x86 policy."
Nick Kralevich [Wed, 26 Feb 2014 21:37:29 +0000 (21:37 +0000)]
Merge "Add policy for MIPS emulator, fix x86 policy."

10 years agoMerge "Conditionally include the 'samplecode' rules."
Ying Wang [Wed, 26 Feb 2014 19:58:58 +0000 (19:58 +0000)]
Merge "Conditionally include the 'samplecode' rules."

10 years agoConditionally include the 'samplecode' rules.
Ying Wang [Wed, 26 Feb 2014 19:55:38 +0000 (11:55 -0800)]
Conditionally include the 'samplecode' rules.

Not sure goal 'samplecode' is still used by anybody these days.

Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47

10 years agoInclude privileged apps with app zip file.
Robert Craig [Wed, 26 Feb 2014 16:48:20 +0000 (11:48 -0500)]
Include privileged apps with app zip file.

Include apps that appear under /system/priv-app
to also be included with the zip of all the apps.

Change-Id: If4687cf4c471877f11d78b68bad96f1842e49d87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
10 years agoAdd policy for MIPS emulator, fix x86 policy.
Stephen Smalley [Wed, 26 Feb 2014 13:49:39 +0000 (08:49 -0500)]
Add policy for MIPS emulator, fix x86 policy.

The qemud and /dev/qemu_pipe policy bits copied to generic
and generic_x86 by I620d4aef84a5d4565abb1695db54ce1653612bce
are required for generic_mips as well.  In testing, we
further saw other denials for generic_mips that correspond
exactly to what is already allowed in the generic sepolicy, so
just inherit the sepolicy files from generic for now.
We could do likewise for the generic_x86 sepolicy for the files that are
identical with generic if desired, but that is not done by this change.

The generic_x86 sepolicy was missing a rule for /sys/qemu_trace
moved to the generic sepolicy by the prior change, so fix that omission.

The generic*64 variants will need something similar, either by inheriting
from one of the existing sepolicy directories as in the MIPS
case or by forking their own copies as in the x86 case.

Change-Id: Iec7c8825734a3f96f7db8ae1d10dce1f30b22bdf
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
10 years agoAdd usage comment to explain how to limit modules in mmm.
Primiano Tucci [Wed, 26 Feb 2014 11:09:19 +0000 (11:09 +0000)]
Add usage comment to explain how to limit modules in mmm.

68895a96 has introduced the possibility to limit the modules being
built by mmm. In many occasions this can save a lot of developement
time since it allows to build one target without processing all the
makefiles in the Android tree. Unfortunatelly this nice feature is
undocumented. This CL adds the one line documentation.

Change-Id: I6ded32c4774047599e9c44e5ea71c07e65731cda

10 years agoMerge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
Torne (Richard Coles) [Wed, 26 Feb 2014 11:04:03 +0000 (11:04 +0000)]
Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."

10 years agoMerge "Fix prebuilt library dependency for multilib build"
Ying Wang [Wed, 26 Feb 2014 02:33:30 +0000 (02:33 +0000)]
Merge "Fix prebuilt library dependency for multilib build"

10 years agoFix prebuilt library dependency for multilib build
Ying Wang [Wed, 26 Feb 2014 02:26:29 +0000 (18:26 -0800)]
Fix prebuilt library dependency for multilib build

Also we don't need to include module_arch_supported.mk again, if we are
currently substituting the source build with LOCAL_PREBUILT_MODULE_FILE.

Change-Id: I444b0397d74c3153b398a050b762e49418062a86

10 years agoMerge "oprofile/daemon doesn't build for x86_64."
Elliott Hughes [Wed, 26 Feb 2014 02:02:30 +0000 (02:02 +0000)]
Merge "oprofile/daemon doesn't build for x86_64."

10 years agooprofile/daemon doesn't build for x86_64.
Elliott Hughes [Wed, 26 Feb 2014 01:32:22 +0000 (17:32 -0800)]
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

10 years agoMerge "Remove external/wpa_supplicant_8 and external/android-clat"
Ying Wang [Wed, 26 Feb 2014 01:21:11 +0000 (01:21 +0000)]
Merge "Remove external/wpa_supplicant_8 and external/android-clat"

10 years agoRemove external/wpa_supplicant_8 and external/android-clat
Ying Wang [Wed, 26 Feb 2014 01:15:47 +0000 (17:15 -0800)]
Remove external/wpa_supplicant_8 and external/android-clat

from 64_bit_blacklist.mk.
They now build fine for 64-bit.

Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba

10 years agoMerge "Take libcore off the LP64 blacklist."
Elliott Hughes [Wed, 26 Feb 2014 00:18:04 +0000 (00:18 +0000)]
Merge "Take libcore off the LP64 blacklist."

10 years agoMerge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
Ying Wang [Wed, 26 Feb 2014 00:13:01 +0000 (00:13 +0000)]
Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"

10 years agoGenerate .pb.cc/.pb.h to arch-neutral generated_sources_dir
Ying Wang [Tue, 25 Feb 2014 19:18:40 +0000 (11:18 -0800)]
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir

So a library can export the proto's include path that can be used with
both archs in multilib build.

Change-Id: Ia0f92f0b40e39dc3fa426c69c52139a0a8f04077

10 years agoTake libcore off the LP64 blacklist.
Elliott Hughes [Tue, 25 Feb 2014 23:54:26 +0000 (15:54 -0800)]
Take libcore off the LP64 blacklist.

Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73

10 years agoMerge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
Nick Kralevich [Tue, 25 Feb 2014 21:54:39 +0000 (21:54 +0000)]
Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."

10 years agoMove qemud and /dev/qemu policy bits to emulator-specific sepolicy.
Stephen Smalley [Tue, 25 Feb 2014 18:37:06 +0000 (13:37 -0500)]
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.

Change-Id: I620d4aef84a5d4565abb1695db54ce1653612bce
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
10 years agoAllow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
Torne (Richard Coles) [Wed, 12 Feb 2014 14:24:41 +0000 (14:24 +0000)]
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.

For host executables and shared libraries, the global LDFLAGS were being
inserted into the linker command line after the module-specific ones,
making it impossible to override the default settings. Change the order
to match target linker invocations.

Change-Id: Icd5f6f83df9f27a5be97ddb197ee245c1ab8c2be

10 years agoMerge "generic_x86: toggle 64bit binder ABI"
Ying Wang [Mon, 24 Feb 2014 18:05:33 +0000 (18:05 +0000)]
Merge "generic_x86: toggle 64bit binder ABI"

10 years agoMerge "Make -rpath-link work with multilib."
Ying Wang [Sat, 22 Feb 2014 00:38:43 +0000 (00:38 +0000)]
Merge "Make -rpath-link work with multilib."

10 years agoMake -rpath-link work with multilib.
Ying Wang [Sat, 22 Feb 2014 00:17:05 +0000 (16:17 -0800)]
Make -rpath-link work with multilib.

Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783

10 years agoMerge "Switch to LLVM 3.4 prebuilts in AOSP."
Tim Murray [Fri, 21 Feb 2014 21:52:15 +0000 (21:52 +0000)]
Merge "Switch to LLVM 3.4 prebuilts in AOSP."

10 years agoMerge "arm64: don't build emulator"
Colin Cross [Thu, 20 Feb 2014 22:49:32 +0000 (22:49 +0000)]
Merge "arm64: don't build emulator"

10 years agoarm64: don't build emulator
Colin Cross [Thu, 20 Feb 2014 22:39:09 +0000 (14:39 -0800)]
arm64: don't build emulator

There is no emulator kernel yet, so don't try to build the emulator.

Change-Id: I714f5717f439b4e48a973f4355f2c6684af79764

10 years agoMerge "Include $(BUILD_COPY_HEADERS) in upper-level makefiles"
Ying Wang [Thu, 20 Feb 2014 22:24:09 +0000 (22:24 +0000)]
Merge "Include $(BUILD_COPY_HEADERS) in upper-level makefiles"

10 years agoInclude $(BUILD_COPY_HEADERS) in upper-level makefiles
Ying Wang [Thu, 20 Feb 2014 21:54:43 +0000 (13:54 -0800)]
Include $(BUILD_COPY_HEADERS) in upper-level makefiles

This makes sure copy_headers.mk only be included onces, no matter
it's for the 1st arch or the 2nd arch.

Change-Id: I80a558fbdb52861f176bd27a21c302069a5cc3ce

10 years agoMerge "Strip all symbols on x86"
Ying Wang [Thu, 20 Feb 2014 18:31:07 +0000 (18:31 +0000)]
Merge "Strip all symbols on x86"

10 years agoMerge "Remove dead code."
Ying Wang [Thu, 20 Feb 2014 18:30:51 +0000 (18:30 +0000)]
Merge "Remove dead code."

10 years agoMerge "Add missing $(combo_2nd_arch_prefix)s to mips."
Ying Wang [Thu, 20 Feb 2014 04:31:29 +0000 (04:31 +0000)]
Merge "Add missing $(combo_2nd_arch_prefix)s to mips."

10 years agoAdd missing $(combo_2nd_arch_prefix)s to mips.
Elliott Hughes [Thu, 20 Feb 2014 02:47:50 +0000 (18:47 -0800)]
Add missing $(combo_2nd_arch_prefix)s to mips.

Change-Id: I91a5f2d92cc964cbaeb1c07f27eb56ea1a0d53cc

10 years agoRemove dead code.
Ying Wang [Thu, 20 Feb 2014 02:25:55 +0000 (18:25 -0800)]
Remove dead code.

It seems the code was meant to add the toolchain to ANDROID_BUILD_PATHS
and then export to PATH by lunch.
But now we export the toolchain to PATH explicitly in envsetup.sh and
the code is unnecessary.
This reduces the places to change when we upgrade the gcc version.
It also fixed the bug that the mips toolchain was always exported
regardless of the target arch.

Change-Id: Iee3b895b4c4e0df8971c27c01b9ecbd591848b12