summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add policy for MIPS emulator, fix x86 policy.Stephen Smalley2014-02-262-0/+16
| | | | | | | | | | | | | | | | | | | | | 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>
* Merge "Fix prebuilt library dependency for multilib build"Ying Wang2014-02-265-8/+7
|\
| * Fix prebuilt library dependency for multilib buildYing Wang2014-02-255-8/+7
|/ | | | | | | 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
* Merge "oprofile/daemon doesn't build for x86_64."Elliott Hughes2014-02-261-0/+1
|\
| * oprofile/daemon doesn't build for x86_64.Elliott Hughes2014-02-251-0/+1
| | | | | | | | | | | | | | 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
* | Merge "Remove external/wpa_supplicant_8 and external/android-clat"Ying Wang2014-02-261-5/+0
|\ \ | |/ |/|
| * Remove external/wpa_supplicant_8 and external/android-clatYing Wang2014-02-251-5/+0
|/ | | | | | | from 64_bit_blacklist.mk. They now build fine for 64-bit. Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
* Merge "Take libcore off the LP64 blacklist."Elliott Hughes2014-02-261-1/+0
|\
| * Take libcore off the LP64 blacklist.Elliott Hughes2014-02-251-1/+0
| | | | | | | | Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
* | Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"Ying Wang2014-02-261-5/+12
|\ \
| * | Generate .pb.cc/.pb.h to arch-neutral generated_sources_dirYing Wang2014-02-251-5/+12
| |/ | | | | | | | | | | | | So a library can export the proto's include path that can be used with both archs in multilib build. Change-Id: Ia0f92f0b40e39dc3fa426c69c52139a0a8f04077
* | Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."Nick Kralevich2014-02-2518-1/+52
|\ \ | |/ |/|
| * Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.Stephen Smalley2014-02-2518-1/+52
|/ | | | | Change-Id: I620d4aef84a5d4565abb1695db54ce1653612bce Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* Merge "generic_x86: toggle 64bit binder ABI"Ying Wang2014-02-241-0/+1
|\
| * generic_x86: toggle 64bit binder ABIOctavian Purdila2014-02-111-0/+1
| | | | | | | | | | Change-Id: I60b8d98ff1f1ba5f242d256279e27d780b5dabf9 Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
* | Merge "Make -rpath-link work with multilib."Ying Wang2014-02-229-18/+19
|\ \
| * | Make -rpath-link work with multilib.Ying Wang2014-02-219-18/+19
| | | | | | | | | | | | Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783
* | | Merge "Switch to LLVM 3.4 prebuilts in AOSP."Tim Murray2014-02-211-6/+16
|\ \ \ | |/ / |/| |
| * | Switch to LLVM 3.4 prebuilts in AOSP.Stephen Hines2014-02-191-6/+16
| | | | | | | | | | | | Change-Id: I064e953fb1bf69e7e321616647aab88dcc39af76
* | | Merge "arm64: don't build emulator"Colin Cross2014-02-201-0/+2
|\ \ \
| * | | arm64: don't build emulatorColin Cross2014-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | There is no emulator kernel yet, so don't try to build the emulator. Change-Id: I714f5717f439b4e48a973f4355f2c6684af79764
* | | | Merge "Include $(BUILD_COPY_HEADERS) in upper-level makefiles"Ying Wang2014-02-205-6/+20
|\ \ \ \
| * | | | Include $(BUILD_COPY_HEADERS) in upper-level makefilesYing Wang2014-02-205-6/+20
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Strip all symbols on x86"Ying Wang2014-02-203-5/+5
|\ \ \ \
| * | | | Strip all symbols on x86C. Sean Young2014-02-193-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Strip all of the non-dynamic symbols on x86 targets, instead of just the debug symbols. Change-Id: Id799a6a8c8b0e8bf70977328e42e5efa23762f25
* | | | Merge "Remove dead code."Ying Wang2014-02-201-25/+0
|\ \ \ \
| * | | | Remove dead code.Ying Wang2014-02-191-25/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Add missing $(combo_2nd_arch_prefix)s to mips."Ying Wang2014-02-201-55/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Add missing $(combo_2nd_arch_prefix)s to mips.Elliott Hughes2014-02-191-55/+55
|/ / / | | | | | | | | | Change-Id: I91a5f2d92cc964cbaeb1c07f27eb56ea1a0d53cc
* | | Merge "Fix x86 config file to support 2nd ARCH build"Ying Wang2014-02-191-59/+59
|\ \ \
| * | | Fix x86 config file to support 2nd ARCH buildQiming Shi2014-02-171-59/+59
| | | | | | | | | | | | | | | | | | | | Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
* | | | Merge "Switch x86_64 to gcc-4.8"Ying Wang2014-02-191-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Switch x86_64 to gcc-4.8Pavel Chupin2014-02-181-1/+1
| |/ / | | | | | | | | | | | | | | | | | | x86 is already on gcc-4.8 Change-Id: I39b4298b705a6ad04cdaa434261c6b0d90d552ff Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
* | | Merge "x86: set -msse2 for all builds"Colin Cross2014-02-191-0/+1
|\ \ \
| * | | x86: set -msse2 for all buildsColin Cross2014-02-181-0/+1
| |/ / | | | | | | | | | | | | | | | All supported x86 processors have SSE2. Change-Id: Ib4a0511c456fe3185b0b902390860ad557aeedcf
* | | Merge "Add bcc to the list of PRODUCT_PACKAGES to install."Stephen Hines2014-02-181-0/+1
|\ \ \
| * | | Add bcc to the list of PRODUCT_PACKAGES to install.Stephen Hines2014-02-181-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7342767 As part of the process of sandboxing the online RenderScript compiler, we need to install bcc. Change-Id: Ia650bdcb760246f3f1e15ebb867f07d9802cdfbe
* | | Merge "Fix up android.core CTS tests."Narayan Kamath2014-02-171-75/+81
|\ \ \
| * | | Fix up android.core CTS tests.Narayan Kamath2014-02-171-75/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix several wrongly configured tests that were either looking for tests in the wrong jar (apache-harmony-tests instead of core-tests) or using the wrong prefix. Also, this change creates subsets of the harmony tests based on subpackage names (java.net, java.io, java.nio etc.) instead of the earlier harmony groupings. Change-Id: Iea0e20d23512611d1aac92b2f8219031b6396c77
* | | | Merge "changing the rules following java package renaming for ↵Narayan Kamath2014-02-171-13/+13
|\ \ \ \ | |/ / / | | | | | | | | external/apache-harmony."
| * | | changing the rules following java package renaming forTsu Chiang Chuang2014-02-171-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external/apache-harmony. (cherry picked from commit 27b4b5ffe12b179fc0d24747f9ead2d5f52c871a) Change-Id: Ia5a7b2d401f23dfdc556ef1982efd441ed1d1ae2
* | | | Merge "Adding apache-harmony to cts."Narayan Kamath2014-02-171-4/+122
|\ \ \ \ | |/ / /
| * | | Adding apache-harmony to cts.Tsu Chiang Chuang2014-02-171-4/+122
| | | | | | | | | | | | | | | | | | | | | | | | (cherry-picked from commit 5fef52e9c986184796ff1e5fe54390614ba318a6) Change-Id: I9a6595f5e8bc30654a062e0917d3ecd3ba28ebc7
* | | | Merge "add jsr166 tests to cts. Bug: 10390711"Narayan Kamath2014-02-171-3/+14
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | add jsr166 tests to cts.Tsu Chiang Chuang2014-02-171-3/+14
| | | | | | | | | | | | | | | | | | Bug: 10390711 Change-Id: I512770e98f61995fc33043d35562dc3b213a4930
* | | Merge "gettop: fix symlink detection"Ying Wang2014-02-141-1/+1
|\ \ \
| * | | gettop: fix symlink detectionsynergy2013-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: We must use the -P flag for pwd to properly get $PWD from the environment *with* symlinks. Otherwise symlink detection is broken and anything we do using $(gettop) at the top of a symlinked path won't work properly. I noticed this issue while running on a system that has a SSD RAID symlinked to my android build home directory, which is ~/ssd_storage. The top in this instance is a symlink, which means that gettop() returns my home path, or the path above the symlink directory (but not the symlinked directory). This is a major issue in case developers choose to use $(gettop), $ANDROID_BUILD_TOP, or $T (doesn't really matter either way). Test Plan: Create a symlink and sync android source into the path. Open up the symlink, run envsetup.sh, and check $(gettop) output. While this isn't the best solution, it fixes an issue without creating new issues. Change-Id: I65bc345753805e6161098d2af6e0bee0b07d37b1
* | | | Merge "Fix incorrect x86 build rules."Stephen Hines2014-02-143-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix incorrect x86 build rules.Stephen Hines2014-02-133-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their linker command lines. This results in clang builds not working properly, since they strip some unknown flags from TARGET_GLOBAL_CFLAGS. Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
* | | | Merge "fix build"Colin Cross2014-02-141-1/+1
|\ \ \ \
generated by cgit v1.1 at 2025-04-01 08:03:16 +0000