Commit Graph

7099 Commits

Author SHA1 Message Date
Filip Gruszczynski 8eade31f98 am 7fbb988d: Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev
* commit '7fbb988da154ad91461c3d51994ae0ff99d94032':
  Add percent library to support libraries build.
2015-05-13 23:46:29 +00:00
dcashman c0ba40b8a1 Merge "Remove libc++ from prepackaged shared libs in cts." into mnc-dev 2015-05-13 18:38:18 +00:00
dcashman 49b362d4b8 Remove libc++ from prepackaged shared libs in cts.
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: 214a171424)

Bug: 19566396
Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa
2015-05-13 11:31:25 -07:00
Bart Sears 0ed694f326 DO NOT MERGE - Change PLATFORM_VERSION from MNC to M
Goodbye to the cookie...

Change-Id: I0474115250411ccdfbdc769c6a464f9dbc460e8f
2015-05-12 18:42:13 -07:00
Dan Albert 93f22ee7e2 Merge "Disallow using stlport." into mnc-dev 2015-05-12 23:11:10 +00:00
Evgeniy Stepanov 04cfb9e113 Merge changes Idd0f477f,I937d2020,I3b95c868 into mnc-dev
* changes:
  --no-as-needed needs -Wl.
  Fix AddressSanitizer link order and multilib setup.
  Make asan more closely match clang behavior.
2015-05-12 22:34:16 +00:00
Dan Albert bdd8ca0604 --no-as-needed needs -Wl.
Not sure why my checkbuild passed.

Change-Id: Idd0f477faebf0b7d79998c8a86610728c2c8cc5d
2015-05-12 14:04:55 -07:00
Evgenii Stepanov 6708b6c99c Fix AddressSanitizer link order and multilib setup.
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
2015-05-12 13:40:29 -07:00
Dan Albert eebb800170 Make asan more closely match clang behavior.
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
2015-05-12 13:40:26 -07:00
Ying Wang 480a9bb64e Keep Throwable's constructor that takes a String argument.
Bug: 20495321
Change-Id: Iaf041da325e1d31f136f36e8ed85b2d90c578b0e
2015-05-11 14:56:20 -07:00
Filip Gruszczynski 8c97e1782b Add percent library to support libraries build.
Change-Id: I8d54f4249f609032fde1d015900204e284fc0c60
2015-05-11 11:58:01 -07:00
Andres Morales 821a554c1b Merge "[versionitis] pull image id from recovery into props" into mnc-dev 2015-05-08 22:04:27 +00:00
Andres Morales b8876e111e [versionitis] pull image id from recovery into props
- remove root/build.prop, merge with root/default.prop

Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4
2015-05-08 14:46:16 -07:00
Ying Wang 90598cb70c Cleaned the outdated incrementaljavac.
Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
2015-05-08 13:27:25 -07:00
Ying Wang d508778493 Merge "Revert "Fix and cleanup."" into mnc-dev 2015-05-08 18:51:22 +00:00
Ying Wang 884738e4a6 Revert "Fix and cleanup."
This reverts commit f28bad5227.

Change-Id: Ib64936457a1236fabbe7c6b9c56f52ef650342e7
2015-05-08 18:51:00 +00:00
Ying Wang 22571e1857 Merge "Fix and cleanup." into mnc-dev 2015-05-08 18:11:55 +00:00
Dan Albert 0a4122a4f2 Disallow using stlport.
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 3a360a7353)
2015-05-08 09:56:48 -07:00
Ying Wang 1af02e6116 Merge "Fix Mac build." into mnc-dev 2015-05-08 03:59:15 +00:00
Ying Wang b4b767a484 Fix Mac build.
Mac doesn't like "cp -r -L", but "cp -R -L".

Change-Id: I32bd8e5171db4ed811e158d91482671b14622825
2015-05-07 20:57:56 -07:00
Ying Wang f28bad5227 Fix and cleanup.
- 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
2015-05-07 16:53:13 -07:00
Dmitriy Ivanov f55c5a52ac Do not pack relocations for executables
Bug: http://b/20665974
Change-Id: Ibc13b5d6bd05dfbc7ff8475068fe7363f58e7e67
(cherry picked from commit e24b6f77ff)
2015-05-07 14:12:00 -07:00
Yigit Boyar 8c7121de86 Merge "DO NOT MERGE Remove RecyclerView tests form pathmap" into mnc-dev 2015-05-07 01:40:10 +00:00
Yigit Boyar fa358f7228 DO NOT MERGE Remove RecyclerView tests form pathmap
Bug: 20675894
Change-Id: Ia482c860b7c02f1c37b94c961cf283754c60cbcc
(cherry picked from commit a85c85ae37)
2015-05-07 01:13:53 +00:00
Jeff Brown 64434af772 Revert "Build docs for android-support-media-protocols.jar."
This reverts commit 5d0da1f959.

Bug: 20641986
Change-Id: I68d79186179b8b542b323ab630c6ed7620eb6f27
2015-05-06 16:02:20 -07:00
Chih-Hung Hsieh 0ba68bafa3 Upgrade x86 gcc to 4.9 and disable devirtualization.
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 90036610dd)
2015-05-06 00:24:18 +00:00
Ying Wang 4f5d0e60b4 Raise SDK version for ProGuard processing when app links support library.
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 8e8d1e7aba)
2015-05-05 17:35:12 +00:00
Dmitriy Ivanov 258b29cf76 Pack module before making symbolic version
We need PT_LOAD segments to match for the gdb sake.
  If we pack module after stripping symbolic version
  PT_LOAD differ from actual ones; this confuses gdb.

Bug: http://b/20687795
Change-Id: If7b1ffcda918d0cc47051a30ca1202007ed62403
2015-05-04 12:42:51 -07:00
Ying Wang 069f1f8942 Deference symlinks when copying LOCAL_PICKUP_FILES.
Change-Id: I2399529ee9168bb93a4cad5daa61cd2ea500df04
2015-04-30 19:46:00 -07:00
Ying Wang ffe376b49e Fix jack transformation on prebuilt AAR.
Change-Id: I74f932cff606138943d97b923bbd059bcd496e46
2015-04-30 09:55:08 -07:00
Dmitriy Ivanov 5924f142cc Revert "Revert "Pack relocations for mips64""
This reverts commit 6399dcce59.

Bug: http://b/20658994
(cherry picked from commit 8387d99ec3)
2015-04-29 23:11:03 -07:00
Dmitriy Ivanov 0cabfed78e Revert "Revert "Pack relocations for mips""
This reverts commit d05fd6fc82.

Bug: http://b/20658994
Change-Id: Iccbd4846b310306ed11b87f4566b8aaadfa63ebb
(cherry picked from commit cb2b3d47ad)
2015-04-29 15:44:20 -07:00
Dimitry Ivanov 8fb3350f1a Merge "Revert "Pack relocations for mips"" into mnc-dev 2015-04-29 19:37:46 +00:00
Dimitry Ivanov d896883bfe Revert "Pack relocations for mips"
This reverts commit 9dc1a7359f.

Bug: http://b/20658994
Change-Id: Ib10c764a7d06db823ee2fccfa47240e0a639d4bc
(cherry picked from commit d05fd6fc82)
2015-04-29 12:33:19 -07:00
Dimitry Ivanov 3e037e36d0 Revert "Pack relocations for mips64"
This reverts commit 8bd30fe3cb.

Bug: http://b/20658994
Change-Id: I6c31094559a12b824344802bf3993f91aee79a26
(cherry picked from commit 6399dcce59)
2015-04-29 12:32:27 -07:00
Chris Banes 0e8383ca6f am 8f168d1b: Add design support library docs
* commit '8f168d1b986516112d103958070830c9075f6ce2':
  Add design support library docs
2015-04-29 09:17:22 +00:00
Chris Banes 8f168d1b98 Add design support library docs
BUG: 20524332
Change-Id: I471ab17a2a5ccc43f4ef0fa04b7c2e9077d56361
2015-04-28 12:01:49 +01:00
Elliott Hughes 4091bdb168 am 6e40faa2: am 44984951: am 162e1906: am b271669a: Merge "Fix a trivial comment typo."
* commit '6e40faa241b241f1c32edb40d36f9c407d8f6790':
  Fix a trivial comment typo.
2015-04-25 18:44:03 +00:00
Elliott Hughes 449849513b am 162e1906: am b271669a: Merge "Fix a trivial comment typo."
* commit '162e19061c7fcdf9e212a561f75427cf1126ea67':
  Fix a trivial comment typo.
2015-04-25 18:23:50 +00:00
Elliott Hughes b271669a0c Merge "Fix a trivial comment typo." 2015-04-25 18:04:21 +00:00
Elliott Hughes ae1d4b0d18 Fix a trivial comment typo.
Bug: https://code.google.com/p/android/issues/detail?id=170069
Change-Id: Iacd308893561a991971b191d4d10a78ca82753d4
2015-04-25 11:02:40 -07:00
Nick Kralevich b126ae9e3a am c98d6b35: am 6612d4a0: am edc3371a: am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit 'c98d6b35ba7e9381089b1b7c8b47f384e5772a4f':
  host compiler: enable compiler hardening flags
2015-04-25 05:15:48 +00:00
Nick Kralevich 6612d4a088 am edc3371a: am f3a6b07b: Merge "host compiler: enable compiler hardening flags"
* commit 'edc3371aeaf0f963d95b4d8bfb0e35b8b17ee648':
  host compiler: enable compiler hardening flags
2015-04-25 04:54:12 +00:00
Nick Kralevich 100acd1001 host compiler: enable compiler hardening flags
Enable the following compiler hardening flags:

* -Wl,-z,relro
* -Wl,-z,now
* -fstack-protector

relro / bind_now make the relro region read-only after linking,
preventing certain attacks against ELF data structures.

stack-protector adds stack canaries, which can detect exploits
which overwrite parts of the stack.

Explicitly not added in this change is FORTIFY_SOURCE=2. Adding that
option turns on glibc's warn_unused_result attributes. This generates
a huge number of new compile time warnings, and for the multiple
makefiles which have -Werror in them, turns those warnings into errors.
I'm not able to fix all the errors right away.

Bug: 20558757
Change-Id: I86791177c6695f5325233d9dd9a5dd3ccc2b1a2f
2015-04-24 21:26:08 -07:00
Dmitriy Ivanov 0be46e11a6 am 80421984: am aac1b9d9: am f674a67d: am 573dfb7c: Merge "Pack relocations for mips64"
* commit '804219841d7f581cf78f3f68e13381b6631513a0':
  Pack relocations for mips64
2015-04-25 00:31:30 +00:00
Dmitriy Ivanov aac1b9d9bf am f674a67d: am 573dfb7c: Merge "Pack relocations for mips64"
* commit 'f674a67d6ef3d446dd726ce9600bd905815506b6':
  Pack relocations for mips64
2015-04-25 00:09:51 +00:00
Dmitriy Ivanov 155d7cc845 am 7347196a: am df7afb47: am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '7347196acbf640caaf68e4e790489a40d770a083':
  Do not pack relocations for prebuilts by default
2015-04-24 23:36:21 +00:00
Dmitriy Ivanov 8bd30fe3cb Pack relocations for mips64
Bug: http://b/18051137
Change-Id: I063c5d6cf007658c0efe9cb1d65ed8026b3e7dae
2015-04-24 16:34:09 -07:00
Dmitriy Ivanov df7afb47d8 am 3b023915: am 4fa4e4be: Merge "Do not pack relocations for prebuilts by default"
* commit '3b023915e8374341c6a69cd40b0811e10b3cb1b5':
  Do not pack relocations for prebuilts by default
2015-04-24 23:14:00 +00:00
Dmitriy Ivanov 4fa4e4befd Merge "Do not pack relocations for prebuilts by default" 2015-04-24 22:56:08 +00:00