Commit Graph

7241 Commits

Author SHA1 Message Date
Miao Wang a11f6c2f0e [RenderScript] Only upgrade RS target API for compat build.
- Fix build

Bug: 22796994
Bug: 22693954
Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71
2015-07-29 11:46:23 -07:00
Miao Wang 1a30e03641 am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
* commit '302e944c6034060eb7ff51ea2a3abe740cf2c9b7':
  [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 18:05:06 +00:00
Ian Pedowitz db042bdccd Bump PLATFORM_PREVIEW_SDK_VERSION to 3
Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
2015-07-29 10:37:24 -07:00
Miao Wang 302e944c60 [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
Bug: 22796994
Bug: 22693954

This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target
devices. It also fixes an issue where the target RenderScript API is
below 21 for 64-bit compilation. In those cases, we should always
upconvert it to 21 (since that is the first available 64-bit release).

Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
2015-07-28 19:30:20 -07:00
Dan Albert 2183dcb2e3 am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""
* commit '215959e77d345899fbafa20f765b497b3ac37301':
  Revert "Revert "Hide unwinder symbols in each binary.""
2015-07-22 20:23:12 +00:00
Dan Albert 215959e77d Revert "Revert "Hide unwinder symbols in each binary.""
Bug: 18471342
Bug: 19958712
This reverts commit 61f675bb53.

Change-Id: I87d3655d1238a9cf26d96dcb0665ba5110931800
(cherry picked from commit 686a557689)
2015-07-21 15:51:10 -07:00
Ying Wang 80ba4a3fb9 am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
* commit 'c671a7cf5cae42b61991d9b72e53d9d8a6ace84e':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:00:55 +00:00
Ying Wang c671a7cf5c Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
  so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.

Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
2015-07-20 21:26:53 -07:00
Ying Wang e9b4605a9a am 7ac6cb80: Add LOCAL_NO_LIBGCC.
* commit '7ac6cb804083a67d31a16b910dabfb76b30150a3':
  Add LOCAL_NO_LIBGCC.
2015-07-16 22:18:19 +00:00
Ying Wang 7ac6cb8040 Add LOCAL_NO_LIBGCC.
This can be used to compile independent libraries without the need for
libgcc.a.

Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
(cherry picked from commit 75011b2003)
2015-07-16 13:36:47 -07:00
Ying Wang e421b10f1c am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev
* commit 'e8ecab8d099f465d527f7bc0fbd04f26ac477a93':
  Don't uncompress/page-align the jni libraries in apps_only build.
2015-07-16 19:01:55 +00:00
Ying Wang e8ecab8d09 Merge "Don't uncompress/page-align the jni libraries in apps_only build." into mnc-dev 2015-07-16 18:51:19 +00:00
George Mount 54152d3062 am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev
* commit '087243ddcb61b602f4d4eb03022844021a659fda':
  Add data binding to built javadoc.
2015-07-16 14:29:34 +00:00
George Mount 087243ddcb Merge "Add data binding to built javadoc." into mnc-dev 2015-07-16 14:18:43 +00:00
Ying Wang 1f8964d388 Don't uncompress/page-align the jni libraries in apps_only build.
Don't uncompress/page-align the jni libraries in apps_only build,
because the apk may be run on older platforms that don't support loading
jni directly from apk.
When prebuilt apks are installed to platform build, the build system
will automatically uncompress/page-align the prebuit apks in M and
downstream, so no need to uncompress/page-align in the apps_only build
either.

Bug: 22491084
Change-Id: I67e977b2592800ae467450592069843b4e5fc466
2015-07-15 18:34:20 -07:00
George Mount 5349e7dd6b Add data binding to built javadoc.
Bug 22175560

Change-Id: I979bcac5131270c679b6f1867c3211096696a86a
2015-07-13 16:44:44 -07:00
Thierry Strudel 8d7066c148 am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py
* commit '6b74f21a4d3ff7ed7bb8463210263e9ecb27830a':
  oem_image/custom_image: fix missing new parameter to build_image.py
2015-07-13 23:31:15 +00:00
Thierry Strudel 6b74f21a4d oem_image/custom_image: fix missing new parameter to build_image.py
Bug: 22441494
Change-Id: I0baa4db67ab7a17dc89193511702ed98e7515318
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-07-13 14:46:49 -07:00
Tao Bao d07bfc5196 Temporarily use blockimgdiff v2 for OTA.
angler and bullhead have smaller cache partiton (~100MB) and hit issue
with incremental OTA (such as MDA09B to MDA12) that requires more stash
space with BBOTA v3. Temporarily use v2 as a workaround, until we come
up with a real fix. Note that BBOTA v2 still uses some stash space, but
should be much smaller than v3.

Bug: 22430577
Change-Id: Ic4c05f3609732e7d5140703062da9fe11df5c6d3
2015-07-12 23:45:24 -07:00
Thierry Strudel 74a81e6633 fix device specific fs_config on build server
fs_config function from libcutils, in order to properly set the xattr FS
used to define device specific uid, gid, permissions and capabilities,
now needs TARGET_OUT make variable to be passed explicitly to all tools
using it:
  fs_config
  fs_get_stats used by mktarball.sh
  make_ext4fs used by mkuserimg.sh
  mksquashfs used by mksquashfsimage.sh

Bug: 21989305
Bug: 22048934
Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-07-10 10:55:54 -07:00
Tao Bao c7a6f1e4f8 Retry adjusting the size computation for reserved blocks.
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e69.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
2015-06-29 20:45:53 -07:00
Tao Bao 2384d01c1c Revert "Adjust the size computation for reserved blocks"
We should not change the parameter to mkfs_ext4. Bug filed at
b/22174684. Will come up with a new CL.

This reverts commit efbb5d2e69.

Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
2015-06-29 12:55:38 -07:00
Dianne Hackborn a42551685f Raise API level to 23.
Now apps can target both MNC and 23.

Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
2015-06-26 15:54:10 -07:00
Ying Wang 78d1cba0f4 Fix conflict resolving error in ef5dc90bba
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
2015-06-26 14:06:32 -07:00
Ying Wang 742f5832b1 Raise progaurd library to platform libraries even for "current" SDK.
Without this change, if an app with "LOCAL_SDK_VERSION := current" links
against a static library that uses removed APIs, the app will fail
ProGuard processing because the removed APIs can't be found in the
current SDK. This works around the issue.

Bug: 18510449
Bug: 20667396
Change-Id: Ia6e2a81cf5ecba972d155e56238ea946f8539411
2015-06-26 19:37:28 +00:00
Mohamad Ayyash aae1a0ba48 resolved conflicts for merge of 1a4658cd to mnc-dev 2015-06-25 17:24:05 -07:00
Mohamad Ayyash 1a4658cd3b resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-dev 2015-06-24 16:54:12 -07:00
Simon Wilson b7b7aedeb3 Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-dev 2015-06-24 23:14:07 +00:00
Mohamad Ayyash 914811a9f2 Merge "Add img2simg in host and ota packages" into mnc-dev 2015-06-24 23:13:51 +00:00
Mohamad Ayyash ef5dc90bba Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:13:07 -07:00
Simon Wilson 6d5ddc32ab resolved conflicts for merge of ecfc97f7 to mnc-dev
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
2015-06-24 16:06:34 -07:00
Mohamad Ayyash 353265b081 Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 23:01:27 +00:00
Simon Wilson ecfc97f772 resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
2015-06-24 15:42:27 -07:00
Adam Powell 30638322e7 Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev 2015-06-24 20:32:15 +00:00
Adam Powell 0cf80f3ab8 Bump PLATFORM_PREVIEW_SDK_VERSION to 2
Change-Id: I6633e0077a6a89ef737d7c4b686aab033d94c41b
2015-06-24 13:04:22 -07:00
Mohamad Ayyash 9ff8a7162b am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev
* commit 'f35ed6bd8497633c057030e5442cd0fc29b37b6c':
  Allow flashing a squashfs system image
2015-06-24 01:38:26 +00:00
Mohamad Ayyash f35ed6bd84 resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev 2015-06-23 16:22:32 -07:00
Tao Bao efbb5d2e69 Adjust the size computation for reserved blocks
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

Bug: 21522719
Bug: 22023465
Change-Id: I49f16adbf2dedc5279fbb8622bf99ef71dcc494f
2015-06-23 14:53:28 -07:00
Simon Wilson f86e7eeabc Add compressor options for squashfs system images
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
2015-06-22 15:42:52 -07:00
leozwang 5c91af0d94 Merge "Add BUILD NUMBER into oem image." into mnc-dev 2015-06-22 00:36:06 +00:00
leozwang 92eb5703e5 Add BUILD NUMBER into oem image.
Change-Id: If2e1903a44fc033eecb1564aa423cd60b3c86fcb
2015-06-20 21:05:19 -07:00
David Srbecky ab13975219 Pass --no-generate-debug-info to dex2oat.
The two flags have been merged and renamed in ART.

(cherry picked from commit d8fae9a6a6)

Bug: 21924613
Change-Id: Iffc1dcc6764367239d6f45a3598cdb2c5d5d5013
2015-06-19 02:34:58 +01:00
Mohamad Ayyash cade49ddee Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:11:21 -07:00
Tim Murray b461acdedb Merge "Add support for cortex-a53 variants when building 64-bit." into mnc-dev 2015-06-12 18:37:11 +00:00
C. Sean Young 6f44670ada am cbaead4c: am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit 'cbaead4cfe737c96c649672b6c1396c35597b5b7':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 17:43:46 +00:00
C. Sean Young cbaead4cfe am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit '540772fa2287e63a0c745229fb72b78903c9cd70':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 16:29:25 +00:00
Tim Murray b6b20af512 Add support for cortex-a53 variants when building 64-bit.
Change-Id: I3f1fb5dbde731d9c3d6db26a46bc7f0f54d8e071
2015-06-11 16:02:13 -07:00
Adrian Roos 6784cae413 Switch build to stricter aapt symbol generation
Prevents aapt from generating java symbols for strings that don't have
a default localization.

Bug: 21537397
Change-Id: I2f17397e33d823045f7dcff02e3d0817f3f81849
2015-06-10 20:00:13 +00:00
C. Sean Young cf4699895a Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
These directories are excluded in addition to OUT_DIR.
This can be useful if your build system has other output directories
beyond what OUT_DIR is set to.

Change-Id: I6d98a85bcc8c89279e939406a7fec32547e8922f
2015-06-10 13:00:13 -05:00
Claes Elgemark b5cd1f03c2 Add missing shared libraries to dist tools
(cherry pick from d0ec665727)

Add missing libraries used by e2fsck and build_verity_tree.

Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
2015-06-09 09:16:27 -07:00
Dimitry Ivanov 72bced8a75 Merge changes from topic 'prebuilt-open-from-apk' into mnc-dev
* changes:
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 18:33:00 +00:00
Narayan Kamath cf7fbcd03d Remove duplicate CTS tests from libcore cts packages.
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.

Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.

bug: 20862863
Change-Id: I44348052d20312d478bdbf6df0e561db63e18cd8
2015-06-04 10:50:52 +00:00
Yohann Roussel a9dd74c395 Merge "Add support for RMTYPEDEF with Jack" into mnc-dev 2015-06-02 09:36:27 +00:00
Ying Wang 226eb92321 Uncompress .so files before signing the apk.
- In uncompress-shared-libs we may strip .so files not for the current
  TARGET_ARCH. So we need to strip first and then sign the apk.
- For PRESIGNED apks, make sure we don't strip the .so files even if
   they are "fat".

Bug: 21571418
Bug: 8076853
Change-Id: Ifd1193dda0c2cd52ac148064ce5a32bcdd03f75c
2015-06-01 19:19:57 -07:00
Ying Wang 1fb0152ff7 Don't extract jni from prebuilt apks.
- We don't need LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES now, for we always
  page-align jni shared libraries and store them umcompressed.
- For prebuilt apks, we don't extract jni any more; Instead we always run
  uncompress-shared-libs on them.
- For apks built from source, we still install the jni separately, because
  that way multiple apks can share the same jni and it saves space.

With this change, for most prebuilt apks, we don't need to specify
LOCAL_PREBUILT_JNI_LIBS ("@lib/<abi>/foo.so") any more, for the build
system automatically replaces the embedded jni with uncompressed files;
But if a prebuilt is a fat apk (i.e. containing jni not needed by the
current product architecture), you still need LOCAL_PREBUILT_JNI_LIBS to
specify what jni to keep. Otherwise all embedded jni will be replaced with
uncompressed files, that wastes space.

Bug: 8076853
Change-Id: Ic3666dc72bf17cd293787414dd185470b365f967
2015-06-01 19:19:45 -07:00
Andrew Hsieh d760d4676b Revert "Revert "Enable linker -fix-cortex-a53-843419""
This reverts commit 32e1689684.

Now that prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9 is also updated

Change-Id: Id95c1c4cc651c434461655e62b8f23afd56b53e4
2015-06-02 07:59:24 +08:00
Ying Wang 4fe7bfd373 Add $ORIGIN/lib[64] to host binary's rpath.
Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the exsiting SDK
directory structure.

Bug: 21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
2015-06-01 10:43:29 -07:00
Chih-Hung Hsieh ad2494bb79 Remove gcc 4.9 workaround.
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.

BUG: 19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
2015-05-29 10:27:58 -07:00
Yohann Roussel 5b2c6e26db Add support for RMTYPEDEF with Jack
Bug: 21099584
Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
2015-05-28 18:10:03 +02:00
Ying Wang 45c8b574b6 am b5f59372: am 30a411f0: am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit 'b5f5937280ef2d561d84be7f52d91a8dbecb87ef':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 23:40:49 +00:00
Ying Wang b5f5937280 am 30a411f0: am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '30a411f0f61dd74fb870fb97b8d2129dbfb85024':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 23:24:19 +00:00
Ying Wang 58b3ee2863 am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '12f449756587b83cd6a04c793e05b837ceb41563':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 22:32:41 +00:00
Ying Wang 12f4497565 Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
Change-Id: I0a0c4fe0cdd9c162976ef5f4c4709d400fde2d5a
2015-05-27 15:14:28 -07:00
Patrick Tjin 899717ff2a Add huawei to vendor owner whitelist [DO NOT MERGE]
Change-Id: I4996eeb43e414f327e6e9b52564044771bfbc1c3
(cherry picked from commit 7f6fb274b7)
2015-05-27 03:31:38 +00:00
Kris Giesing f93d8dd6c2 Merge "Remove RecyclerView tests form pathmap" into lmp-mr1-ub-dev 2015-05-22 18:58:18 +00:00
Jose Lima b222b6e62c Add recommendation suport library to build
Change-Id: Ica884fa2bae30979dd7d17b18a004459ad161da3
2015-05-21 16:27:15 -07:00
Adam Powell 0d007cf6d0 Merge "Initialize ro.build.version.preview_sdk" into mnc-dev 2015-05-21 22:17:41 +00:00
Adam Powell bdd5e8e7fe Initialize ro.build.version.preview_sdk
Set the initial (version 1!) value for the preview SDK version
readable by apps. If we're on a release version, force it to be 0.

Change-Id: Ib3e6cad1f59cea8e4a781827d4a35dd3620b90f1
2015-05-21 13:49:05 -07:00
Ying Wang a6ffb929f4 FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
Because we don't have 32-bit prebuilt libLLVM/libclang.

Change-Id: I86dac33e9bcbcb3d197f7d1e4c9d33bd4e7c473e
(cherry picked from commit e5d4e74f9f)
2015-05-19 22:34:40 -07:00
Ying Wang 69425c1dcb am 44acba6d: am 02026edf: am bf6b82fb: am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '44acba6d37b1d13ef3a3ec6d89e5121f691089d9':
  Add task to print transitive dependencies and their license files.
2015-05-20 01:15:47 +00:00
Ying Wang 44acba6d37 am 02026edf: am bf6b82fb: am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '02026edf4d104750fde070862636d29db4124b3a':
  Add task to print transitive dependencies and their license files.
2015-05-20 01:03:22 +00:00
Ying Wang bf6b82fbf1 am 247f5c4f: am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '247f5c4fce9e2cf1911458be1591517c1e7dbc42':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:39:27 +00:00
Ying Wang 247f5c4fce am 1bd15569: am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '1bd155692f2e7ddc4fb6b874fc586ba8ab86a363':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:28:37 +00:00
Ying Wang 1bd155692f am e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit 'e528e44d31498ad83482b1860036916d0fded379':
  Add task to print transitive dependencies and their license files.
2015-05-20 00:11:27 +00:00
Ying Wang e528e44d31 Merge "Add task to print transitive dependencies and their license files." into lmp-dev 2015-05-19 23:58:47 +00:00
Ying Wang a1ea202256 Add task to print transitive dependencies and their license files.
Print modules and their transitive dependencies with license files.
To invoke, run
"make deps-license PROJ_PATH=<proj-path-patterns> DEP_PATH=<dep-path-patterns>".
PROJ_PATH restricts the paths of the source modules;
DEP_PATH restricts the paths of the dependency modules.
Both can be makefile patterns supported by makefile function $(filter).
Example:
  $ make deps-license packages/app/% external/%
  prints all modules in packages/app/ with their dpendencies in external/.
The printout lines look like "<module_name> :: <module_paths> :: <license_files>".

Bug: 20823995
Change-Id: I06b66e85ff56c8628bffa3d948085ed45870100f
(cherry-pick from 39b9b690a8)
2015-05-19 16:37:42 -07:00
Ying Wang 589e8c52fb Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- When raising the ProGuard sdk version for platform build, use
  TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- Also added SUPPORT_LIBRARY_ROOT to reference support library resource
  dir.

Bug: 20658265
Change-Id: Ib008d8e70508723db91431a062cac691367f2f6c
2015-05-19 16:03:57 -07:00
Yohann Roussel 0a0b640f50 Merge "Save Jack default extra args in a file" into mnc-dev 2015-05-19 09:27:43 +00:00
Siva Velusamy 70b67accbf Don't exclude GPL binaries from the emulator system image
GPL binaries are allowed on device and emulator as well

b/20341087

Change-Id: I777dccd0d5442ae2cd0b7e222f6a9beaa3648c37
2015-05-18 23:14:18 +00:00
Yohann Roussel b6bfb5893a Save Jack default extra args in a file
Change-Id: I059b36fc71679eb5c95f05ede26d8037c742921b
2015-05-18 09:44:49 +02:00
Vince Harron a48c74fb3d Improved/clarified license guidance for GPL code.
This messaging approved by Google Open Source Licensing.

Change-Id: I717e8b5003fd856b3e2e6c28394591b5d6939b43
2015-05-15 17:01:01 -07:00
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