OSDN Git Service

android-x86/build.git
10 years agoGenerates SDK stubs of android-support-multidex
Yohann Roussel [Wed, 21 Aug 2013 12:19:44 +0000 (14:19 +0200)]
Generates SDK stubs of android-support-multidex

(cherry picked from commit c4441b8c3701147365213a1f789626a8d442db6e)

Conflicts:
        core/pathmap.mk

Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f

10 years agoSupport dx generating multiple dex files.
Yohann Roussel [Tue, 20 Aug 2013 15:05:27 +0000 (17:05 +0200)]
Support dx generating multiple dex files.

Dx is now capable of generating multiple dex file in one run.
This capability is not compatible with --output=*.dex so this CL
changes the --output argument to be a directory. This CL also
includes the packaging of the multiple dex files when dx generates
more than one dex file.

(cherry picked from commit 8ffe9c3e7967ec9c6c6e9a03095454dc1b073c3b)

Conflicts:
        core/java.mk

Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb

10 years agoMerge "Revert "Fix Java detection on some Linux distributions""
Ying Wang [Tue, 15 Jul 2014 01:23:49 +0000 (01:23 +0000)]
Merge "Revert "Fix Java detection on some Linux distributions""

10 years agoRevert "Fix Java detection on some Linux distributions"
Ying Wang [Tue, 15 Jul 2014 01:22:50 +0000 (01:22 +0000)]
Revert "Fix Java detection on some Linux distributions"

This reverts commit 09040dd8232f8fe588d938e04581ba1648f452f4.

Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97

10 years agoMerge "Fix Java detection on some Linux distributions"
Ying Wang [Mon, 14 Jul 2014 21:36:53 +0000 (21:36 +0000)]
Merge "Fix Java detection on some Linux distributions"

10 years agoMerge "Remove bcc from generic_no_telephony.mk."
Stephen Hines [Mon, 14 Jul 2014 20:28:27 +0000 (20:28 +0000)]
Merge "Remove bcc from generic_no_telephony.mk."

10 years agoRemove bcc from generic_no_telephony.mk.
leozwang [Mon, 14 Jul 2014 17:28:38 +0000 (10:28 -0700)]
Remove bcc from generic_no_telephony.mk.

bcc was added into core_minimal.mk.

Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc

10 years agoMerge "Add bcc into /system/bin."
Stephen Hines [Mon, 14 Jul 2014 20:27:53 +0000 (20:27 +0000)]
Merge "Add bcc into /system/bin."

10 years agoAdd bcc into /system/bin.
leozwang [Sun, 13 Jul 2014 05:03:52 +0000 (22:03 -0700)]
Add bcc into /system/bin.

Bug: 16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf

10 years agoFix Java detection on some Linux distributions
Bernhard Rosenkränzer [Mon, 14 Jul 2014 08:42:11 +0000 (10:42 +0200)]
Fix Java detection on some Linux distributions

On some Linux distributions (spotted here on OpenMandriva Lx, but I'm
pretty sure some others do the same thing), "which javac" returns
/usr/bin/javac, which is a symlink to "../../etc/alternatives/javac",
which in turn points at whatever the JDK the user picked as his default.

Given "../../etc/alternatives/javac" is a relative, symlink, the next
iteration of LSLINE=$(ls -l "$JAVAC") fails (no
../../etc/alternatives/java relative to the build directory), causing
tools.jar not to be found.

Using readlink -f should work in all cases (while also simplifying the
script a bit).

Change-Id: I96afcf8e6460861bf8bb849dae05c27c42b91e84
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
10 years agoMerge "Fix PIC default to be -fPIC"
Nick Kralevich [Thu, 10 Jul 2014 17:27:20 +0000 (17:27 +0000)]
Merge "Fix PIC default to be -fPIC"

10 years agoMerge "build: fix host dex2oat runtime args"
Colin Cross [Thu, 10 Jul 2014 06:10:50 +0000 (06:10 +0000)]
Merge "build: fix host dex2oat runtime args"

10 years agobuild: fix host dex2oat runtime args
Colin Cross [Thu, 10 Jul 2014 05:09:50 +0000 (22:09 -0700)]
build: fix host dex2oat runtime args

The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES,
not PRODUCT_PROPERTY_OVERRIDES.
Use $(call func,args) for user defined functions
Prepend the property contents with -Xms or -Xmx when passing to
dex2oat.  This only worked before because DEX2OAT_XMS, etc. were blank
due to the first two  bugs, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.

Change-Id: Ifa30038b397355171fefcc5248eea033bb634036

10 years agoMerge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img"
Ying Wang [Wed, 9 Jul 2014 23:18:08 +0000 (23:18 +0000)]
Merge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img"

10 years agoMerge "Allow symlinks to device or vendor tree in envsetup.sh."
Ying Wang [Wed, 9 Jul 2014 22:40:33 +0000 (22:40 +0000)]
Merge "Allow symlinks to device or vendor tree in envsetup.sh."

10 years agoAllow symlinks to device or vendor tree in envsetup.sh.
Ying Wang [Wed, 9 Jul 2014 22:37:34 +0000 (15:37 -0700)]
Allow symlinks to device or vendor tree in envsetup.sh.

Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529

10 years agoDon't enable LOCAL_DEX_PREOPT for apks outside system.img
Ying Wang [Wed, 9 Jul 2014 17:57:32 +0000 (10:57 -0700)]
Don't enable LOCAL_DEX_PREOPT for apks outside system.img

Bug: 15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f

10 years agoMerge "Make dex2oat heap size product configurable [build]"
Brian Carlstrom [Wed, 9 Jul 2014 04:07:43 +0000 (04:07 +0000)]
Merge "Make dex2oat heap size product configurable [build]"

10 years agoMerge "More consistent use of 64-bit build variable."
Ying Wang [Wed, 9 Jul 2014 01:06:23 +0000 (01:06 +0000)]
Merge "More consistent use of 64-bit build variable."

10 years agoMore consistent use of 64-bit build variable.
Ying Wang [Wed, 9 Jul 2014 00:07:36 +0000 (17:07 -0700)]
More consistent use of 64-bit build variable.

Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.

Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42

10 years agoMake dex2oat heap size product configurable [build]
Brian Carlstrom [Tue, 8 Jul 2014 17:35:29 +0000 (10:35 -0700)]
Make dex2oat heap size product configurable [build]

Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45

10 years agoMerge "ADBS now uses stack_core code to parse traces."
Elliott Hughes [Tue, 8 Jul 2014 20:06:09 +0000 (20:06 +0000)]
Merge "ADBS now uses stack_core code to parse traces."

10 years agoMerge "Remove -Bsymbolic from builds."
Dan Albert [Tue, 8 Jul 2014 18:47:16 +0000 (18:47 +0000)]
Merge "Remove -Bsymbolic from builds."

10 years agoADBS now uses stack_core code to parse traces.
Brigid Smith [Tue, 1 Jul 2014 00:21:27 +0000 (17:21 -0700)]
ADBS now uses stack_core code to parse traces.

Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6

10 years agoMerge "Fix host java doc by referring to the correct classpath."
Ying Wang [Tue, 8 Jul 2014 00:39:35 +0000 (00:39 +0000)]
Merge "Fix host java doc by referring to the correct classpath."

10 years agoFix host java doc by referring to the correct classpath.
Ying Wang [Mon, 7 Jul 2014 23:43:49 +0000 (16:43 -0700)]
Fix host java doc by referring to the correct classpath.

In droiddoc for host, we don't generate classes.jar for
LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead.
This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in
base_rules.mk.

Bug: 9176318
Change-Id: If7460b30ca5da28743487d66da0029a44108d556

10 years agoMerge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
Ying Wang [Tue, 8 Jul 2014 00:17:31 +0000 (00:17 +0000)]
Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."

10 years agoClean the last bit of LOCAL_BUILD_HOST_DEX.
Ying Wang [Tue, 8 Jul 2014 00:15:38 +0000 (17:15 -0700)]
Clean the last bit of LOCAL_BUILD_HOST_DEX.

Long live LOCAL_BUILD_HOST_DEX!

Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0

10 years agoFix PIC default to be -fPIC
Pavel Chupin [Wed, 2 Jul 2014 09:52:21 +0000 (13:52 +0400)]
Fix PIC default to be -fPIC

-fPIC is more restrictive than -fPIE, but when "-fPIC -fPIE" used together
the latter overrides. It may lead to issues when building DSO where
-fPIC and not -fPIE is required.

For executables -fPIE -pie shoudld be added and it's fine to override
-fPIC as it is done now.

The reason why we don't have these issues so far is probably related to
-Bsymbolic added by default. But any attempt to remove it reveals these
problems:
https://android-review.googlesource.com/#/c/98061/

Change-Id: If0f10628b7cc41e564221a7a37298f7d65f859a8
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
10 years agoMerge "Strip all multidex files, not just classes.dex"
Brian Carlstrom [Wed, 2 Jul 2014 16:35:53 +0000 (16:35 +0000)]
Merge "Strip all multidex files, not just classes.dex"

10 years agoStrip all multidex files, not just classes.dex
Brian Carlstrom [Mon, 30 Jun 2014 17:09:56 +0000 (10:09 -0700)]
Strip all multidex files, not just classes.dex

Bug: 10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab

10 years agoMerge "Fix partition_tag usage in install_jni_libs"
Ying Wang [Wed, 2 Jul 2014 16:12:10 +0000 (16:12 +0000)]
Merge "Fix partition_tag usage in install_jni_libs"

10 years agoFix partition_tag usage in install_jni_libs
Dan Willemsen [Wed, 2 Jul 2014 01:56:31 +0000 (18:56 -0700)]
Fix partition_tag usage in install_jni_libs

This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was
empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES.

Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078

10 years agoMerge "More consistent host library path in multilib build."
Ying Wang [Tue, 1 Jul 2014 00:16:30 +0000 (00:16 +0000)]
Merge "More consistent host library path in multilib build."

10 years agoMore consistent host library path in multilib build.
Ying Wang [Tue, 1 Jul 2014 00:06:21 +0000 (17:06 -0700)]
More consistent host library path in multilib build.

In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.

Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1

10 years agoMerge "Fix missing rs_compatibility_jni_libs."
Ying Wang [Mon, 30 Jun 2014 18:21:22 +0000 (18:21 +0000)]
Merge "Fix missing rs_compatibility_jni_libs."

10 years agoFix missing rs_compatibility_jni_libs.
Ying Wang [Mon, 30 Jun 2014 18:17:16 +0000 (11:17 -0700)]
Fix missing rs_compatibility_jni_libs.

Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c

10 years agoMerge "Remove nonexistent $ANDROID_QTOOLS from $PATH."
Ying Wang [Mon, 30 Jun 2014 17:27:07 +0000 (17:27 +0000)]
Merge "Remove nonexistent $ANDROID_QTOOLS from $PATH."

10 years agoRemove nonexistent $ANDROID_QTOOLS from $PATH.
Ying Wang [Mon, 30 Jun 2014 17:25:33 +0000 (10:25 -0700)]
Remove nonexistent $ANDROID_QTOOLS from $PATH.

Bug: 15983070
Change-Id: Id3807a6dabd616ae06aafc2b894c1858e4400e26

10 years agoMerge "Host support for prefer symlink"
Ian Rogers [Sat, 28 Jun 2014 00:26:33 +0000 (00:26 +0000)]
Merge "Host support for prefer symlink"

10 years agoHost support for prefer symlink
Ian Rogers [Wed, 25 Jun 2014 07:04:30 +0000 (00:04 -0700)]
Host support for prefer symlink

We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.

Change-Id: I6045de20c948b456a150033deb3459895aff83c6

10 years agoMerge "Add -Wl,--fatal-warnings to x86_64."
Elliott Hughes [Mon, 30 Jun 2014 22:48:54 +0000 (22:48 +0000)]
Merge "Add -Wl,--fatal-warnings to x86_64."

10 years agoAdd -Wl,--fatal-warnings to x86_64.
Elliott Hughes [Mon, 30 Jun 2014 21:52:30 +0000 (14:52 -0700)]
Add -Wl,--fatal-warnings to x86_64.

Bug: 11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f

10 years agoMerge "Add --pseudo-localize aapt parameter for builds."
Ying Wang [Fri, 27 Jun 2014 16:09:37 +0000 (16:09 +0000)]
Merge "Add --pseudo-localize aapt parameter for builds."

10 years agoAdd --pseudo-localize aapt parameter for builds.
Igor Viarheichyk [Thu, 26 Jun 2014 21:56:21 +0000 (14:56 -0700)]
Add --pseudo-localize aapt parameter for builds.

Some packages can override list of locales with
LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling
pseudolocalization. Adding new --pseudo-localize flag to
aapt if pseudo-locales are specified in product locales
list solves this issue.

Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f

10 years agoMerge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
Ying Wang [Wed, 25 Jun 2014 22:53:17 +0000 (22:53 +0000)]
Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"

10 years agoAllow LOCAL_RESOURCE_DIR pointing to dir generated during the build
Ying Wang [Wed, 25 Jun 2014 20:23:58 +0000 (13:23 -0700)]
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build

Bug: 15850610
Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14

10 years agoMerge "Support to add JNI of both archs in multilib build."
Ying Wang [Wed, 25 Jun 2014 18:33:51 +0000 (18:33 +0000)]
Merge "Support to add JNI of both archs in multilib build."

10 years agoSupport to add JNI of both archs in multilib build.
Ying Wang [Wed, 25 Jun 2014 03:01:52 +0000 (20:01 -0700)]
Support to add JNI of both archs in multilib build.

Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.

Bug: 15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81

10 years agoMerge "Invoke debuggerd64 when appropriate with stacks."
Michael Wright [Wed, 25 Jun 2014 01:25:49 +0000 (01:25 +0000)]
Merge "Invoke debuggerd64 when appropriate with stacks."

10 years agoInvoke debuggerd64 when appropriate with stacks.
Michael Wright [Fri, 20 Jun 2014 02:58:12 +0000 (19:58 -0700)]
Invoke debuggerd64 when appropriate with stacks.

Read out the ELF header to see if the executable is 64-bit or 32-bit,
then call the appropriate debuggerd. In bash. Ugh.

Change-Id: I6550fe92e775659cd0370bcb70f40dd59238ad8f

10 years agoMerge "Resolve :32 to 32-bit variant only if the variant exists."
Ying Wang [Tue, 24 Jun 2014 18:12:47 +0000 (18:12 +0000)]
Merge "Resolve :32 to 32-bit variant only if the variant exists."

10 years agoResolve :32 to 32-bit variant only if the variant exists.
Ying Wang [Tue, 24 Jun 2014 17:22:17 +0000 (10:22 -0700)]
Resolve :32 to 32-bit variant only if the variant exists.

Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.

Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92

10 years agoMerge "Switch another reference from core to core-libart"
Ying Wang [Mon, 23 Jun 2014 22:44:38 +0000 (22:44 +0000)]
Merge "Switch another reference from core to core-libart"

10 years agoSwitch another reference from core to core-libart
Brian Carlstrom [Mon, 23 Jun 2014 22:34:17 +0000 (15:34 -0700)]
Switch another reference from core to core-libart

Bug: 14298175
Change-Id: I37dc7d5bc63d967db4b3cb8aee695a40b12a8c8d

10 years agoMerge "Updated gdbclient path support."
Elliott Hughes [Mon, 23 Jun 2014 18:47:25 +0000 (18:47 +0000)]
Merge "Updated gdbclient path support."

10 years agoUpdated gdbclient path support.
Brigid Smith [Fri, 20 Jun 2014 21:12:12 +0000 (14:12 -0700)]
Updated gdbclient path support.

Now gdbclient accepts a fully qualified pathname for EXEs, which it will
not modify, or a relative pathname, to which it will prefix
"/system/bin".  As an example, each of the following now works.

Fully qualified:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient /system/bin/ping :5039 /system/bin/ping

Relative:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient ping :5039 /system/bin/ping

Change-Id: I1e4c9fca64c4fbc52c255271cc7f83f35c258509

10 years agoMerge " delete duplicate variable definition"
Ying Wang [Mon, 23 Jun 2014 16:51:26 +0000 (16:51 +0000)]
Merge " delete duplicate variable definition"

10 years agoMerge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
Brian Carlstrom [Fri, 20 Jun 2014 20:55:58 +0000 (20:55 +0000)]
Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"

10 years agoBump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Brian Carlstrom [Fri, 20 Jun 2014 20:09:25 +0000 (13:09 -0700)]
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64

Change-Id: Ia856159017f6228dbfd5a7100e3731b82e6e8fe4

10 years agoMerge "Restore AOSP-style version numbers - DO NOT MERGE"
Bill Yi [Fri, 20 Jun 2014 17:54:09 +0000 (17:54 +0000)]
Merge "Restore AOSP-style version numbers - DO NOT MERGE"

10 years agoRestore AOSP-style version numbers - DO NOT MERGE
Bill Yi [Thu, 19 Jun 2014 07:22:38 +0000 (00:22 -0700)]
Restore AOSP-style version numbers - DO NOT MERGE

10 years agoMerge "Switch from core to core-libart"
Brian Carlstrom [Thu, 19 Jun 2014 02:10:14 +0000 (02:10 +0000)]
Merge "Switch from core to core-libart"

10 years agoSwitch from core to core-libart
Brian Carlstrom [Wed, 18 Jun 2014 22:11:01 +0000 (15:11 -0700)]
Switch from core to core-libart

Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898

10 years agoMerge "Document the worker_threads option."
Ying Wang [Thu, 19 Jun 2014 17:07:19 +0000 (17:07 +0000)]
Merge "Document the worker_threads option."

10 years agoMerge "Rewrite the clean steps for TARGET_2ND_ARCH."
Ying Wang [Wed, 18 Jun 2014 21:17:45 +0000 (21:17 +0000)]
Merge "Rewrite the clean steps for TARGET_2ND_ARCH."

10 years agoRewrite the clean steps for TARGET_2ND_ARCH.
Ying Wang [Wed, 18 Jun 2014 19:07:48 +0000 (12:07 -0700)]
Rewrite the clean steps for TARGET_2ND_ARCH.

Convert clean rules from TARGET_ARCH to TARGET_2ND_ARCH and vice versa.

Change-Id: I5711b38cd834272d26d78e5cf847e97f27139c5b

10 years agoMerge "Remove some uses of the deprecated WITH_HOST_DALVIK."
Brian Carlstrom [Wed, 18 Jun 2014 20:44:10 +0000 (20:44 +0000)]
Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."

10 years agoRemove some uses of the deprecated WITH_HOST_DALVIK.
Ian Rogers [Wed, 11 Jun 2014 23:30:04 +0000 (16:30 -0700)]
Remove some uses of the deprecated WITH_HOST_DALVIK.

Bug: 13751317.
Change-Id: I4beb81089b4ad7dac4d87571509389d1dae22bf3

10 years agoMerge "Fix the CTS build now that core is gone"
Neil Fuller [Thu, 19 Jun 2014 10:29:38 +0000 (10:29 +0000)]
Merge "Fix the CTS build now that core is gone"

10 years agoFix the CTS build now that core is gone
Neil Fuller [Thu, 19 Jun 2014 10:21:08 +0000 (11:21 +0100)]
Fix the CTS build now that core is gone

Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8

10 years agoMerge "build: delete 64-bit blacklist"
Colin Cross [Wed, 18 Jun 2014 20:17:06 +0000 (20:17 +0000)]
Merge "build: delete 64-bit blacklist"

10 years agobuild: delete 64-bit blacklist
Colin Cross [Wed, 18 Jun 2014 04:35:44 +0000 (21:35 -0700)]
build: delete 64-bit blacklist

The last projects in the blacklist have been fixed, delete the code.

Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee

10 years agoMerge "Use the correct MKBOOTIMG."
Ying Wang [Wed, 18 Jun 2014 18:32:29 +0000 (18:32 +0000)]
Merge "Use the correct MKBOOTIMG."

10 years agoUse the correct MKBOOTIMG.
Ying Wang [Wed, 18 Jun 2014 18:31:21 +0000 (11:31 -0700)]
Use the correct MKBOOTIMG.

Change-Id: I7450a85770cc8de2ea313570999a7d7076e950d2

10 years agoMerge "Removed /system/bin prefix from gdbclient."
Elliott Hughes [Wed, 18 Jun 2014 00:46:13 +0000 (00:46 +0000)]
Merge "Removed /system/bin prefix from gdbclient."

10 years agoRemoved /system/bin prefix from gdbclient.
Brigid Smith [Wed, 28 May 2014 21:36:43 +0000 (14:36 -0700)]
Removed /system/bin prefix from gdbclient.

Now a program run through gdbclient will not automatically have
/system/bin added to its path, so programs not in /system/bin will no
longer need to be prefixed with ../../.

The following now works as an example:
 adb shell gdbserver :5039 /system/xbin/crasher
 bg
 gdbclient /system/xbin/crasher :5039 /system/xbin/crasher

And the following now no longer works:
 adb shell gdbserver :5039 /system/xbin/crasher
 bg
 gdbclient ../../system/xbin/crasher :5039 /system/xbin/crasher

Change-Id: I299b66d03915aeb1dc300e43a81c9a51f0bd7dec

10 years agoMerge "Help catch common 32/64-bit errors."
Brian Carlstrom [Tue, 17 Jun 2014 23:26:28 +0000 (23:26 +0000)]
Merge "Help catch common 32/64-bit errors."

10 years agoHelp catch common 32/64-bit errors.
Brian Carlstrom [Tue, 17 Jun 2014 21:36:05 +0000 (14:36 -0700)]
Help catch common 32/64-bit errors.

(cherry picked from commit cf5ea762e015bc044d251814d9062ef1df4dd49f)

Change-Id: I43eb93d41967c63acb0723083c0178019f1364d0

10 years agoMerge "Coalesce generic_x86 and generic sepolicy where possible."
Nick Kralevich [Tue, 17 Jun 2014 16:42:01 +0000 (16:42 +0000)]
Merge "Coalesce generic_x86 and generic sepolicy where possible."

10 years agoCoalesce generic_x86 and generic sepolicy where possible.
Stephen Smalley [Mon, 16 Jun 2014 16:36:49 +0000 (12:36 -0400)]
Coalesce generic_x86 and generic sepolicy where possible.

We originally forked a complete copy of generic/sepolicy into
generic_x86/sepolicy, but we can instead inherit from it and
merely add rules as needed under generic_x86/sepolicy.

Change-Id: I21e1a1425ce08676a8ea69685a4761db3bfde628
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
10 years agoRestore generic_x86 sepolicy zygote.te file.
Stephen Smalley [Tue, 17 Jun 2014 13:20:17 +0000 (09:20 -0400)]
Restore generic_x86 sepolicy zygote.te file.

I87d0976800557d73064e2da038315b0d019d7a60 removed zygote.te from
generic/sepolicy and generic/BoardConfig.mk but also incorrectly
removed it from generic_x86/BoardConfig.mk, even though
generic_x86/sepolicy/zygote.te still exists and contains rules
needed on the x86 emulator.  Otherwise the zygote fails with
execmem denials on the x86 emulator.

(x86 emulator is also broken currently due to yaffs2 /cache yielding
unlabeled denials, but that is unrelated to this change).

Change-Id: Ie36ed4ed7ba478a377f9a0d4383d006b49bde5cc
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
10 years agoMerge "Restore generic_x86 sepolicy zygote.te file."
Nick Kralevich [Tue, 17 Jun 2014 13:39:05 +0000 (13:39 +0000)]
Merge "Restore generic_x86 sepolicy zygote.te file."

10 years agoMerge "Make default 64-bit primary, 32-bit secondary"
Narayan Kamath [Tue, 17 Jun 2014 09:50:40 +0000 (09:50 +0000)]
Merge "Make default 64-bit primary, 32-bit secondary"

10 years agoMake default 64-bit primary, 32-bit secondary
Brian Carlstrom [Mon, 16 Jun 2014 23:51:42 +0000 (16:51 -0700)]
Make default 64-bit primary, 32-bit secondary

Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5

10 years agoMerge "Also include the binaries for the 2nd arch."
Ying Wang [Mon, 16 Jun 2014 23:43:14 +0000 (23:43 +0000)]
Merge "Also include the binaries for the 2nd arch."

10 years agoAlso include the binaries for the 2nd arch.
Ying Wang [Mon, 16 Jun 2014 22:14:45 +0000 (15:14 -0700)]
Also include the binaries for the 2nd arch.

Also include the binaries for the 2nd arch when building module
packages.

Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6

10 years agoExplicit record the modules' built-file:installed-file
Ying Wang [Mon, 19 May 2014 20:03:36 +0000 (13:03 -0700)]
Explicit record the modules' built-file:installed-file

- This simplifies the logic to get the mapping of built-file to
  installed-file. Previously we used file suffix matching which is error
  prone and not scalable.
- With this change the .odex files will be included automatically.

Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36

10 years agoPut modules with install path to system/ to DATA/ in the zip file.
Ying Wang [Fri, 16 May 2014 03:45:39 +0000 (20:45 -0700)]
Put modules with install path to system/ to DATA/ in the zip file.

Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86

10 years agoMerge "Explicit record the modules' built-file:installed-file"
Ying Wang [Mon, 16 Jun 2014 23:42:55 +0000 (23:42 +0000)]
Merge "Explicit record the modules' built-file:installed-file"

10 years agoMerge "Revert "Allow all domains access to /dev/qemu_trace.""
dcashman [Mon, 16 Jun 2014 17:53:19 +0000 (17:53 +0000)]
Merge "Revert "Allow all domains access to /dev/qemu_trace.""

10 years agoRevert "Allow all domains access to /dev/qemu_trace."
dcashman [Mon, 16 Jun 2014 17:45:16 +0000 (10:45 -0700)]
Revert "Allow all domains access to /dev/qemu_trace."

This reverts commit b1b12f8ad49ecbba7dd6b9db2a0ca8fafa532d82.

10 years agoAllow all domains access to /dev/qemu_trace.
dcashman [Fri, 13 Jun 2014 22:30:57 +0000 (15:30 -0700)]
Allow all domains access to /dev/qemu_trace.

/dev/qemu_trace is used by memcheck on qemu to get memory allocation events
from all processes on the system.  Allow all domains to access this device, and
other qemu-specific devices..

Addresses the following denials:
type=1400 audit(1402674828.500:3): avc:  denied  { read write } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.500:4): avc:  denied  { open } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:5): avc:  denied  { read write } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:6): avc:  denied  { open } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:7): avc:  denied  { read write } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:8): avc:  denied  { open } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:9): avc: denied { read write } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:10): avc: denied { open } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.180:11): avc: denied { read write } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:12): avc: denied { read write } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:13): avc: denied { open } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:14): avc: denied { open } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:15): avc: denied { read write } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:16): avc: denied { open } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:17): avc: denied { read write } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:18): avc: denied { open } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.860:22): avc: denied { read write } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.870:23): avc: denied { open } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file

Bug: 15570479
Change-Id: I4999a1eb5c25b4238c53fe1e989bcf5fed1ae355

10 years agoMerge "Put modules with install path to system/ to DATA/ in the zip file."
Ying Wang [Mon, 16 Jun 2014 23:42:40 +0000 (23:42 +0000)]
Merge "Put modules with install path to system/ to DATA/ in the zip file."

10 years agoMerge "Allow all domains access to /dev/qemu_trace."
dcashman [Mon, 16 Jun 2014 22:53:22 +0000 (22:53 +0000)]
Merge "Allow all domains access to /dev/qemu_trace."

10 years agoAllow all domains access to /dev/qemu_trace.
dcashman [Mon, 16 Jun 2014 21:17:05 +0000 (14:17 -0700)]
Allow all domains access to /dev/qemu_trace.

/dev/qemu_trace is used by memcheck on qemu to get memory allocation events
from all processes on the system.  Allow all domains to access this device, and
other qemu-specific devices.

Addresses the following denials:
type=1400 audit(1402674828.500:3): avc:  denied  { read write } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.500:4): avc:  denied  { open } for  pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:5): avc:  denied  { read write } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.520:6): avc:  denied  { open } for  pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:7): avc:  denied  { read write } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674828.610:8): avc:  denied  { open } for  pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:9): avc: denied { read write } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.000:10): avc: denied { open } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.180:11): avc: denied { read write } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:12): avc: denied { read write } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:13): avc: denied { open } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.200:14): avc: denied { open } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:15): avc: denied { read write } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674829.280:16): avc: denied { open } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:17): avc: denied { read write } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674830.580:18): avc: denied { open } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.860:22): avc: denied { read write } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file
type=1400 audit(1402674930.870:23): avc: denied { open } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file

Bug: 15570479
Change-Id: I87d0976800557d73064e2da038315b0d019d7a60

10 years agoMerge "Remove unused hosts."
Elliott Hughes [Mon, 16 Jun 2014 22:13:39 +0000 (22:13 +0000)]
Merge "Remove unused hosts."

10 years agoRemove unused hosts.
Elliott Hughes [Mon, 16 Jun 2014 21:48:59 +0000 (14:48 -0700)]
Remove unused hosts.

Nobody is using freebsd-x86 or linux-ppc.

Change-Id: I4e19fd32d92b39ad574001e7046e37ccd2300a2e

10 years agoMerge "Allow all domains access to /dev/qemu_trace."
dcashman [Mon, 16 Jun 2014 17:14:47 +0000 (17:14 +0000)]
Merge "Allow all domains access to /dev/qemu_trace."

10 years agoMerge "Trim down BUILD_FINGERPRINT."
Ying Wang [Mon, 16 Jun 2014 16:22:47 +0000 (16:22 +0000)]
Merge "Trim down BUILD_FINGERPRINT."