OSDN Git Service
Mathieu Chartier [Fri, 28 Mar 2014 19:19:13 +0000 (19:19 +0000)]
Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
Ying Wang [Thu, 27 Mar 2014 18:57:17 +0000 (18:57 +0000)]
Merge "Increase the maximum javac heap size."
Ying Wang [Thu, 27 Mar 2014 02:23:46 +0000 (19:23 -0700)]
Increase the maximum javac heap size.
Java 7 needs more memory when you run some annotation tools.
Change-Id: Ia8b423244b9ce164500b24867fe2b3d10a5089ff
Colin Cross [Wed, 26 Mar 2014 22:03:47 +0000 (22:03 +0000)]
Merge "add support for LOCAL_MULTILIB"
Colin Cross [Fri, 21 Mar 2014 19:29:32 +0000 (12:29 -0700)]
add support for LOCAL_MULTILIB
LOCAL_MULTILIB replaces LOCAL_32_BIT_ONLY and
LOCAL_NO_2ND_ARCH, although both are still supported.
Set LOCAL_MULTILIB := 32 to always build a module 32-bit.
This is the same as specifying LOCAL_32_BIT_ONLY.
Set LOCAL_MULTILIB := first to always build a module for
the first architecture (64-bit on a 64-bit target, 32-bit on a
32-bit target). This is the same as specifying LOCAL_NO_2ND_ARCH.
Set LOCAL_MULTILIB := both to build for both architectures
on a mulitlib (64-bit) target.
If LOCAL_MULTILIB is not set libraries will default to "both",
and executables, packages, and prebuilts will default to building
for the first architecture if supported by the module, otherwise
the second.
Executables that set LOCAL_MULTILIB := both must set either
LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 or
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to specify how to
differentiate the install locations of the two versions.
Change-Id: I22ab6aa342b231c307b1d8a86cea4fd91eea39f5
Colin Cross [Tue, 25 Mar 2014 23:35:32 +0000 (23:35 +0000)]
Merge topic 'tests'
* changes:
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Colin Cross [Fri, 21 Mar 2014 19:27:37 +0000 (12:27 -0700)]
add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
Some executables will need to be built for both 32-bit and 64-bit.
For linker/linker64, debuggerd/debuggerd64, and a few more, they
will be installed in the same path (/system/bin), but with different
filenames. Allow the module to specify LOCAL_MODULE_STEM_32 and
LOCAL_MODULE_STEM_64 to name the two versions.
Change-Id: I573e8678c7332245a064f31246be0a05f0a9e25f
Colin Cross [Fri, 21 Mar 2014 19:25:44 +0000 (12:25 -0700)]
add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Some executables will need to be built for both 32-bit and 64-bit.
For tests, it will be convienient to keep the name of the executable
the same, but install them in a different location. Add
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to allow a module
to specify different paths for 32-bit and 64-bit executables.
Change-Id: I3be830e899c6d485fe55c25c66b20b3fe64c795e
Tim Murray [Tue, 25 Mar 2014 18:33:28 +0000 (18:33 +0000)]
Merge "Make Clang host builds hermetic on Linux."
Colin Cross [Tue, 25 Mar 2014 17:54:56 +0000 (17:54 +0000)]
Merge "remove libeffects from 64-bit blacklist"
Andrew Hsieh [Tue, 25 Mar 2014 02:43:57 +0000 (02:43 +0000)]
Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
Tim Murray [Thu, 20 Mar 2014 20:48:35 +0000 (13:48 -0700)]
Make Clang host builds hermetic on Linux.
This lays the groundwork for making builds hermetic on Darwin as well.
That will be fixed in a future patch.
bug
13435344
Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
Andrew Hsieh [Sat, 22 Mar 2014 12:36:07 +0000 (20:36 +0800)]
Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Previously we have only one set of include/lib paths for
LOCAL_NDK_STL_VARIANT:=gnustl_static regardless of GCC
version, which is wrong because each GCC version
come with its own libstdc++.
Change-Id: I2a01c2120b6948aedce00e2f8d08dfc6932126dd
Colin Cross [Tue, 25 Mar 2014 01:39:30 +0000 (18:39 -0700)]
remove libeffects from 64-bit blacklist
Everything under frameworks/av/media/libeffects compiles fine for
64-bit
Change-Id: I03519a98903b7d65936053ef7eda8926cce60ea0
Ying Wang [Fri, 21 Mar 2014 23:51:33 +0000 (23:51 +0000)]
Merge "Complete installed shared library dependency"
Ying Wang [Fri, 21 Mar 2014 23:17:04 +0000 (16:17 -0700)]
Complete installed shared library dependency
Previously the installed shared library dependency doesn't include
modules introduced by LOCAL_SHARED_LIBRARIES_<arch>.
This change fix the problem.
It also cleans up use of the shared library variable.
Bug:
13528787
Change-Id: Id8d807cc57f0ec4a71f18b64545d91191efad8fb
Colin Cross [Thu, 20 Mar 2014 20:16:53 +0000 (20:16 +0000)]
Merge "remove more projects from 64-bit blacklist"
Ying Wang [Thu, 20 Mar 2014 20:11:04 +0000 (20:11 +0000)]
Merge "Remove the redundant DISABLE_DEXPREOPT"
Ying Wang [Thu, 20 Mar 2014 19:57:19 +0000 (12:57 -0700)]
Remove the redundant DISABLE_DEXPREOPT
To disable dexpreopt, use just:
WITH_DEXPREOPT=false
Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
Ying Wang [Thu, 20 Mar 2014 19:25:09 +0000 (19:25 +0000)]
Merge "Fix embedded build"
Ying Wang [Thu, 20 Mar 2014 19:13:10 +0000 (12:13 -0700)]
Fix embedded build
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.
Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
Colin Cross [Thu, 20 Mar 2014 07:08:20 +0000 (00:08 -0700)]
remove more projects from 64-bit blacklist
These all build now.
Change-Id: If7c5f58512a2931617900ddc730797750ab8301c
Mathieu Chartier [Wed, 5 Mar 2014 22:45:18 +0000 (14:45 -0800)]
Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000
Required for getting ART with valgrind on device working since
valgrind maps things in the 0x60000000 address range.
Bug:
13323732
Change-Id: I05efdbf3fe5acd1418e1d4ced5844154fb4c5d37
Glenn Kasten [Wed, 19 Mar 2014 21:32:22 +0000 (21:32 +0000)]
Merge "A few other removals for the 64 bit blacklist."
Christopher Ferris [Wed, 19 Mar 2014 18:07:18 +0000 (18:07 +0000)]
Merge "Add a method to leave the symbol table in a library."
Nick Kralevich [Wed, 19 Mar 2014 16:37:39 +0000 (16:37 +0000)]
Merge "Allow shell serial_device read-write access"
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
Christopher Ferris [Tue, 18 Mar 2014 21:50:09 +0000 (14:50 -0700)]
Add a method to leave the symbol table in a library.
When LOCAL_STRIP_MODULE := keep_symbols is set, then the normal strip rules
will be modified so that only the .debug_* sections are removed. The original
symbol table is left alone.
This allows the compilation of certain libraries so that libbacktrace library
can provide meaningful names to functions.
Bug:
12958251
Change-Id: I82bdc304a463012e29086325ccb51163464cb4a9
Ying Wang [Tue, 18 Mar 2014 22:58:49 +0000 (22:58 +0000)]
Merge "Remove 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
Nick Kralevich [Tue, 18 Mar 2014 22:17:35 +0000 (15:17 -0700)]
Allow shell serial_device read-write access
When starting the emulator, the system console writes entries
to /dev/ttyS2. We need to allow the writes, otherwise this generates
denials when you run "emulator -verbose -logcat '*:v' -show-kernel"
Addresses the following denial:
type=1400 audit(
1395076594.320:446): avc: denied { read write } for pid=5600 comm="sh" path="/dev/ttyS2" dev="tmpfs" ino=1487 scontext=u:r:shell:s0 tcontext=u:object_r:serial_device:s0 tclass=chr_file
Bug:
13506702
Change-Id: I3729537cabb0bf8e8b2905d3def43a293bb1081f
Glenn Kasten [Tue, 18 Mar 2014 21:45:12 +0000 (21:45 +0000)]
Merge "Don't blacklist all of frameworks/av for 64-bit"
Greg Hackmann [Tue, 18 Mar 2014 19:21:48 +0000 (19:21 +0000)]
Merge "HACK: disable emulator on x86_64"
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
Ying Wang [Tue, 18 Mar 2014 18:32:05 +0000 (18:32 +0000)]
Merge "Remove 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
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>
Andrew Hsieh [Tue, 18 Mar 2014 00:04:25 +0000 (00:04 +0000)]
Merge "Add 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
Ying Wang [Sun, 16 Mar 2014 20:02:56 +0000 (20:02 +0000)]
Merge "Don'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
Colin Cross [Sat, 15 Mar 2014 23:54:03 +0000 (23:54 +0000)]
Merge "Work 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
Andrew Hsieh [Fri, 14 Mar 2014 00:19:18 +0000 (00:19 +0000)]
Merge "Fix HOST_TOOLCHAIN_PREFIX"
Narayan Kamath [Thu, 13 Mar 2014 09:29:52 +0000 (09:29 +0000)]
Merge "Revert "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
Narayan Kamath [Thu, 13 Mar 2014 09:05:30 +0000 (09:05 +0000)]
Merge "Remove external/chromium from the 64 bit blacklist."
Dmitriy Ivanov [Wed, 12 Mar 2014 18:40:42 +0000 (18:40 +0000)]
Merge "Add 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
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
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
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"
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
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."
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
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.""
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
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."
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
Ying Wang [Mon, 10 Mar 2014 19:25:58 +0000 (19:25 +0000)]
Merge "jdk 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
Clay Murphy [Mon, 10 Mar 2014 18:47:17 +0000 (18:47 +0000)]
Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
Ben Cheng [Fri, 7 Mar 2014 16:49:39 +0000 (16:49 +0000)]
Merge "OProfile 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
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
Nicolas Geoffray [Wed, 5 Mar 2014 14:09:26 +0000 (14:09 +0000)]
Merge "Do not remove the generated .hpp file from yacc."
Nicolas Geoffray [Tue, 4 Mar 2014 17:20:36 +0000 (17:20 +0000)]
Merge "Remove 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
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
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"
Victoria Lease [Mon, 3 Mar 2014 23:38:33 +0000 (23:38 +0000)]
Merge "Add external/google-fonts/*/fonts.mk."
Nicolas Geoffray [Mon, 3 Mar 2014 18:03:29 +0000 (18:03 +0000)]
Merge "Extend YACC and LEX handling to .yy and .ll files."
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."
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
Narayan Kamath [Mon, 3 Mar 2014 11:56:47 +0000 (11:56 +0000)]
Merge "Amend 64 bit blacklist."
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
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
Ying Wang [Sat, 1 Mar 2014 17:25:26 +0000 (17:25 +0000)]
Merge "Try 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
Victoria Lease [Fri, 28 Feb 2014 23:30:57 +0000 (15:30 -0800)]
Add external/google-fonts/*/fonts.mk.
Bug:
12384866
Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50
Ben Cheng [Fri, 28 Feb 2014 18:54:18 +0000 (18:54 +0000)]
Merge "Make 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
Ying Wang [Fri, 28 Feb 2014 02:27:27 +0000 (02:27 +0000)]
Merge "Select 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
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"
Ying Wang [Thu, 27 Feb 2014 17:19:33 +0000 (17:19 +0000)]
Merge "Revert "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
Mark Salyzyn [Thu, 27 Feb 2014 16:03:57 +0000 (16:03 +0000)]
Merge "build: add logd"
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
JP Abgrall [Thu, 27 Feb 2014 02:17:11 +0000 (02:17 +0000)]
Merge "DO 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
Ying Wang [Thu, 27 Feb 2014 01:25:13 +0000 (01:25 +0000)]
Merge "Include privileged apps with app zip file."
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
Ying Wang [Wed, 26 Feb 2014 22:23:46 +0000 (22:23 +0000)]
Merge "Remove 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
Nick Kralevich [Wed, 26 Feb 2014 21:37:29 +0000 (21:37 +0000)]
Merge "Add policy for MIPS emulator, fix x86 policy."
Ying Wang [Wed, 26 Feb 2014 19:58:58 +0000 (19:58 +0000)]
Merge "Conditionally 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
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>
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>