summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove libc++ from prepackaged shared libs in cts." into mnc-devdcashman2015-05-131-2/+1
|\
| * Remove libc++ from prepackaged shared libs in cts.dcashman2015-05-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Commit 28acbeab18f6083299c07f9ebe769d22e49f8107 removed the dependency of sepolicy-analyze on libc++, eliminating the only consumer of the library for the cts host-side tests. Remove the library since it is no longer needed but leave the ability to add other shared libs in the future. (cherry-pick of commit: 214a171424cea488f0a5c042cf18f56550693570) Bug: 19566396 Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa
* | Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release}Geoff Mendal2015-05-131-1/+1
| | | | | | | | Bug: 21095280
* | Merge "New "sm" shell tool to call StorageManager." into mnc-devJeff Sharkey2015-05-131-0/+1
|\ \
| * | New "sm" shell tool to call StorageManager.Jeff Sharkey2015-05-121-0/+1
| | | | | | | | | | | | | | | Bug: 19993667 Change-Id: I9021794eb6f69c7f53151a887a85788d315ab67d
* | | DO NOT MERGE - Change PLATFORM_VERSION from MNC to MBart Sears2015-05-122-1/+6
| | | | | | | | | | | | | | | | | | Goodbye to the cookie... Change-Id: I0474115250411ccdfbdc769c6a464f9dbc460e8f
* | | Merge "Remove stlport from global package list." into mnc-devDan Albert2015-05-121-1/+0
|\ \ \
| * | | Remove stlport from global package list.Dan Albert2015-05-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now whitelisted per device. Bug: http://b/15193147 Change-Id: I7fcd0891242fb552a17753b151cf431a398bbc44 (cherry picked from commit 0a93b56924fe5e12bacbb20f3b62ad93f1b5e577)
* | | | Merge "Disallow using stlport." into mnc-devDan Albert2015-05-121-12/+2
|\ \ \ \ | |/ / /
| * | | Disallow using stlport.Dan Albert2015-05-081-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only remaining users of stlport are vendor blobs. Prevent any new users from using it. Bug: http://b/15193147 Change-Id: I577a16c8c52e2c7d939c3b5026e18ad90e4b9f26 (cherry picked from commit 3a360a7353034be89cbcbb24296c7ae30e6b0ef2)
* | | | Merge changes Idd0f477f,I937d2020,I3b95c868 into mnc-devEvgeniy Stepanov2015-05-124-5/+16
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | * changes: --no-as-needed needs -Wl. Fix AddressSanitizer link order and multilib setup. Make asan more closely match clang behavior.
| * | | --no-as-needed needs -Wl.Dan Albert2015-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Not sure why my checkbuild passed. Change-Id: Idd0f477faebf0b7d79998c8a86610728c2c8cc5d
| * | | Fix AddressSanitizer link order and multilib setup.Evgenii Stepanov2015-05-124-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASan runtime library (when using dynamic linking) must be the first dependency of the main executable to achieve correct symbol interposition. This matches how the clang driver works. In multilib setup, ASan-RT name depends on the target arch: /system/lib/libclang_rt.asan-arm-android.so /system/lib64/libclang_rt.asan-arm64-android.so We also set RPATH to /system/lib/asan or /system/lib64/asan to have a place for ASan-only versions of system libraries. Change-Id: I937d202077b6e433ba476c075d31be818b662d53
| * | | Make asan more closely match clang behavior.Dan Albert2015-05-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always link libm with asan. Hasn't been a problem before because ASAN was only ever used when libc++ was as well, which already links libm. Pass --no-as-needed for host modules. These aren't needed for the target builds because the target uses the shared RTL. Change-Id: I3b95c8682c0f63bac6b726f8cd15c638aaa98311
* | | | Keep Throwable's constructor that takes a String argument.Ying Wang2015-05-111-0/+5
|/ / / | | | | | | | | | | | | Bug: 20495321 Change-Id: Iaf041da325e1d31f136f36e8ed85b2d90c578b0e
* | | Define BOARD_SEPOLICY_DIRS for 64-bit emulators.Stephen Smalley2015-05-113-0/+8
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Define BOARD_SEPOLICY_DIRS for the arm64, mips64, and x86_64 emulator targets. As a first cut, simply inherit from the existing policy directories used for generic and generic_x86. We may need further board-specific policy added for these targets but testing will require first enabling SELinux in the relevant kernel configs. (cherrypicked from commit 21ebc213bb3717ec3e692991eeadc423113943ab) Change-Id: I7b4459b32298698fc2908cbbdd0e3afadbe5ac24 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Wrap zipfile.write(), writestr() and close()Tao Bao2015-05-087-76/+251
| | | | | | | | | | | | | | | | | | | | In order to work around the zip 2GiB limit, we need to wrap the related functions in zipfile. Calls to those functions should always be replaced with calls to the wrappers instead. Bug: 18015246 Change-Id: I499574cee51ec4804bc10cbefe0b17940afed918 (cherry picked from commit 2ed665a033c587b276b1615516e5354e2ace47cd)
* | Merge "[versionitis] pull image id from recovery into props" into mnc-devAndres Morales2015-05-081-24/+29
|\ \
| * | [versionitis] pull image id from recovery into propsAndres Morales2015-05-081-24/+29
| | | | | | | | | | | | | | | | | | - remove root/build.prop, merge with root/default.prop Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4
* | | Cleaned the outdated incrementaljavac.Ying Wang2015-05-082-87/+1
| | | | | | | | | | | | | | | | | | Nobody is using this feature and now we switched to jack. Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
* | | Merge "Revert "Fix and cleanup."" into mnc-devYing Wang2015-05-082-12/+87
|\ \ \
| * | | Revert "Fix and cleanup."Ying Wang2015-05-082-12/+87
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f28bad5227dd566395e458b5266e716d7fa5f958. Change-Id: Ib64936457a1236fabbe7c6b9c56f52ef650342e7
* | | | Merge "Fix and cleanup." into mnc-devYing Wang2015-05-082-87/+12
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix and cleanup.Ying Wang2015-05-072-87/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Detect java-source-list before transforming to java-source-list-uniq. This fixes non-fatal errors in build log like: /bin/bash: out/target/common/obj/APPS/android.core.tests.libcore.package.tzdata_intermediates/classes/java-source-list: No such file or directory - Cleaned the outdated incrementaljavac. Nobody is using this feature and now we switched to jack. Change-Id: If1adb9b5820d9b295a11984c0f170f9a7ff4de7b
* | | Merge "Fix Mac build." into mnc-devYing Wang2015-05-081-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix Mac build.Ying Wang2015-05-071-2/+2
| |/ | | | | | | | | | | Mac doesn't like "cp -r -L", but "cp -R -L". Change-Id: I32bd8e5171db4ed811e158d91482671b14622825
* | Do not pack relocations for executablesDmitriy Ivanov2015-05-071-2/+4
|/ | | | | | Bug: http://b/20665974 Change-Id: Ibc13b5d6bd05dfbc7ff8475068fe7363f58e7e67 (cherry picked from commit e24b6f77ffba8f7d9c2a7acbb7a0b748197d48c4)
* Revert "Switch from Calculator to ExactCalculator"Robin Lee2015-05-071-1/+1
| | | | | | | | | Temporary revert to get TT builds in shape. This reverts commit 846505dc35bb155c1c2cf54d407a946e8f732494. Bug: 20745303 Change-Id: Id3455cba38b7aabaffa63c8531a6430f69897c6e
* am c4ef9bb0: am a9d796a4: docs: Add navigation heading for Develop > PreviewJoe Fernandez2015-05-074-124/+123
|\ | | | | | | | | * commit 'c4ef9bb08f504c3ca58727403f607cd051edbf5d': docs: Add navigation heading for Develop > Preview
| * am a9d796a4: docs: Add navigation heading for Develop > PreviewJoe Fernandez2015-05-074-124/+123
| |\ | | | | | | | | | | | | * commit 'a9d796a4f9e198f17de6f1a27264b1b4fc9a778a': docs: Add navigation heading for Develop > Preview
| | * docs: Add navigation heading for Develop > PreviewJoe Fernandez2015-05-064-124/+123
| | | | | | | | | | | | Change-Id: I133672c6ecb5e778f49c31d091812ed7b6dc6b24
* | | Merge "DO NOT MERGE Remove RecyclerView tests form pathmap" into mnc-devYigit Boyar2015-05-071-2/+3
|\ \ \
| * | | DO NOT MERGE Remove RecyclerView tests form pathmapYigit Boyar2015-05-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 20675894 Change-Id: Ia482c860b7c02f1c37b94c961cf283754c60cbcc (cherry picked from commit a85c85ae370be73fbc920177c87e739d7353059b)
* | | | Revert "Build docs for android-support-media-protocols.jar."Jeff Brown2015-05-061-1/+0
|/ / / | | | | | | | | | | | | | | | | | | This reverts commit 5d0da1f959c5f9f38def94d76cdf0cddf52e3edf. Bug: 20641986 Change-Id: I68d79186179b8b542b323ab630c6ed7620eb6f27
* | | am e94fcf31: am 29e93436: Swap templates-sdk and templates-sdk-dev files to ↵Dirk Dougherty2015-05-0636-7673/+7673
|\ \ \ | |/ / | | | | | | | | | | | | | | | enable redesign builds by default. * commit 'e94fcf31a08a7cce45171b5f8cce29b50d2cefd8': Swap templates-sdk and templates-sdk-dev files to enable redesign builds by default.
| * | am 29e93436: Swap templates-sdk and templates-sdk-dev files to enable ↵Dirk Dougherty2015-05-0636-7673/+7673
| |\ \ | | |/ | | | | | | | | | | | | | | | redesign builds by default. * commit '29e934367b927fb13417bee77008600ad5a39dcc': Swap templates-sdk and templates-sdk-dev files to enable redesign builds by default.
| | * Swap templates-sdk and templates-sdk-dev files to enable redesign builds by ↵Dirk Dougherty2015-05-0536-7673/+7673
| | | | | | | | | | | | | | | | | | default. Change-Id: I9eabbbcd823fb29bd2209172c458cb9dad5f24d2
* | | Upgrade x86 gcc to 4.9 and disable devirtualization.Chih-Hung Hsieh2015-05-063-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also filter out gcc-only flags -Wno-clobbered and -fno-devirtualize when compiled with clang/llvm. BUG: 19872411 Change-Id: I6de57583be04da607f569df65e93531787dbb789 (cherry picked from AOSP commit 90036610ddfe0455553a1b46bb8adbeafde0cac1)
* | | Raise SDK version for ProGuard processing when app links support library.Ying Wang2015-05-052-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION, we artifically raises the "SDK version" "linked" by ProGuard, to - suppress ProGuard warnings of referencing symbols unknown to the lower SDK version. - prevent ProGuard stripping subclass in the support library that extends class added in the higher SDK version. This allows us to remove the dangerous ProGuard flag "-dontwarn android.support.**". Notes: - We don't raise the app's LOCAL_SDK_VERSION, so that the app's own code is still unable to use the higher SDK version. - For platform build, we can't just raise to the "current" SDK, because would break apps that use APIs removed from the current SDK. We raise it to framework.jar instead, which contains the most complete symbol set. Bug: 20658265 Change-Id: I90099073457a65cb8031fbaec6b396d68ce614a7 (cherry picked from commit 8e8d1e7abadb53d5dcb211fac6ab6ed20f5dc9ac)
* | | am e99d5320: am 032a4946: Doc change: css/js, assets for landing page, ↵Dirk Dougherty2015-05-0521-3076/+4597
|\ \ \ | |/ / | | | | | | | | | | | | | | | header/footer designs. * commit 'e99d5320dd70de6f5ada67dd0c2dd9761e6a6c32': Doc change: css/js, assets for landing page, header/footer designs.
| * | am 032a4946: Doc change: css/js, assets for landing page, header/footer designs.Dirk Dougherty2015-05-0521-3076/+4597
| |\ \ | | |/ | | | | | | | | | * commit '032a494654978c3ceed73268f99615ff3d0d686e': Doc change: css/js, assets for landing page, header/footer designs.
| | * Doc change: css/js, assets for landing page, header/footer designs.Dirk Dougherty2015-05-0421-3076/+4597
| | | | | | | | | | | | Change-Id: I9430a725bd7ba12cb0ac7da1a5ed9c3bfa8e321e
* | | am 55abf4c2: am ff233cc9: Doc change: remove deprecated templates-sdk-dyn ↵Dirk Dougherty2015-05-05212-557/+2289
|\ \ \ | |/ / | | | | | | | | | | | | | | | files, add new development files based on production templates-sdk. * commit '55abf4c22d08693cfb2838a79654fc32c7de3ff8': Doc change: remove deprecated templates-sdk-dyn files, add new development files based on production templates-sdk.
| * | am ff233cc9: Doc change: remove deprecated templates-sdk-dyn files, add new ↵Dirk Dougherty2015-05-05212-557/+2289
| |\ \ | | |/ | | | | | | | | | | | | | | | development files based on production templates-sdk. * commit 'ff233cc92e379d501d8b256ba9a015827d77e012': Doc change: remove deprecated templates-sdk-dyn files, add new development files based on production templates-sdk.
| | * Doc change: remove deprecated templates-sdk-dyn files, add new development ↵Dirk Dougherty2015-05-04212-557/+2289
| | | | | | | | | | | | | | | | | | files based on production templates-sdk. Change-Id: I5a94aaa8ba375010191a12f210954c22395fed40
* | | am 657b2971: am fa6ee37f: am 53b98761: docs: fix sticky header hiding ↵Joe Fernandez2015-05-041-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | RenderScript reference headings * commit '657b2971f8a6f4a1b6dac68915c557304970d716': docs: fix sticky header hiding RenderScript reference headings
| * | am fa6ee37f: am 53b98761: docs: fix sticky header hiding RenderScript ↵Joe Fernandez2015-05-011-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | reference headings * commit 'fa6ee37fae42ef08ebcb63dcaf8122f0f6f5311a': docs: fix sticky header hiding RenderScript reference headings
| | * am 53b98761: docs: fix sticky header hiding RenderScript reference headingsJoe Fernandez2015-05-011-1/+2
| | |\ | | | | | | | | | | | | | | | | * commit '53b98761b288fcf833db62bb4700fba20b319961': docs: fix sticky header hiding RenderScript reference headings
| | | * docs: fix sticky header hiding RenderScript reference headingsJoe Fernandez2015-04-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | b/20637508 Change-Id: I64996db4fc986cbe0f4506b5524a708a9e14cbc8
* | | | am 63904d26: am 03b107c8: docs: update masthead template for Preview docsJoe Fernandez2015-05-041-18/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '63904d26ad473d8446fea12775ef37e9ae2c8e59': docs: update masthead template for Preview docs