Commit Graph

41537 Commits

Author SHA1 Message Date
Sundong Ahn ef212cbe8d Add LOCAL_SDK_VERSION := system_$(VER)
The system_$(VER) can be set in LOCAL_SDK_VERSION, and the apk will use
android_system.jar at build time.
If LOCAL_SDK_VERSION is not defined and this module is installed in
vendor.img, LOCAL_SDK_VERSION is set to system_current.

Bug: 67724799
Test: 1. build && run on taimen
2. LOCAL_SDK_VERSION:=system_27 in ims.apk && build ims.apk && check
the vsdk_v27_intermediates.

Change-Id: I5b11c78b8fcd4a2f2a5e3b141527cd34dbe80018
2017-11-30 10:04:09 +09:00
Jayant Chowdhary 26382840ae Merge "Export DIST_DIR to soong on dist builds." am: 824958e880 am: 26f40c264d
am: 8add887830

Change-Id: Icb82ea0d52abcd02bebb6a56c22ca16286aaa0ba
2017-11-28 23:00:02 +00:00
Jayant Chowdhary 8add887830 Merge "Export DIST_DIR to soong on dist builds." am: 824958e880
am: 26f40c264d

Change-Id: I4c68f459eeee7b34d39d369b2c1e8339c3cb8506
2017-11-28 22:53:28 +00:00
Jayant Chowdhary 26f40c264d Merge "Export DIST_DIR to soong on dist builds."
am: 824958e880

Change-Id: Ic7c2f097e5c19cf80ce3b0b2c6ce170f908907b9
2017-11-28 22:46:56 +00:00
Jayant Chowdhary 824958e880 Merge "Export DIST_DIR to soong on dist builds." 2017-11-28 22:38:32 +00:00
Colin Cross 90a25c97e0 Merge "Add support for jacoco in soong" am: 9798690282 am: 863dcf07d4
am: f58de03da6

Change-Id: I75e1aaa5080a7ccb2d8c8ff5cac9c6f4a7147e2f
2017-11-28 21:32:58 +00:00
Colin Cross f58de03da6 Merge "Add support for jacoco in soong" am: 9798690282
am: 863dcf07d4

Change-Id: I7c8f67093167c75318ef8ba7b0bc86077434f25f
2017-11-28 21:25:23 +00:00
Colin Cross 863dcf07d4 Merge "Add support for jacoco in soong"
am: 9798690282

Change-Id: I47534d7346e637aff019b10bfc395254c618d29c
2017-11-28 21:18:48 +00:00
Colin Cross 9798690282 Merge "Add support for jacoco in soong" 2017-11-28 21:10:57 +00:00
Colin Cross ee1d40d9f2 Merge "Add LOCAL_SRCJARS to clear_vars.mk" am: edd5f3810f am: 7ae502ff64
am: c6bbdc86dc

Change-Id: I2723a01758445c63d4ce77281d3d6efeb63c5523
2017-11-28 19:52:19 +00:00
Colin Cross c6bbdc86dc Merge "Add LOCAL_SRCJARS to clear_vars.mk" am: edd5f3810f
am: 7ae502ff64

Change-Id: Ifc061bf79cd7d0641da8209fee9c2a92dfd13745
2017-11-28 19:49:04 +00:00
Colin Cross 7ae502ff64 Merge "Add LOCAL_SRCJARS to clear_vars.mk"
am: edd5f3810f

Change-Id: I894b5d2f2ac84eef65e6fdcf22c968317d4072b2
2017-11-28 19:45:40 +00:00
Treehugger Robot edd5f3810f Merge "Add LOCAL_SRCJARS to clear_vars.mk" 2017-11-28 19:37:29 +00:00
Jayant Chowdhary 85fbcf4a68 Export DIST_DIR to soong on dist builds.
Bug: 64267858

Test: Adding DistDir to build/soong/android/variable.go enables access
      to DIST_DIR_SOONG.

Change-Id: I74faea11255edf37db6a4eaf193df300c363bfb7
2017-11-28 11:26:24 -08:00
Jiyong Park 60290589f7 Merge "add llndk|vndksp.libraries.txt to vndk_package" am: a4fae6e3e4 -s ours am: f0e90d0411 -s ours
am: 802ad504e9  -s ours

Change-Id: Ib4a6286bb70d3796a6630fadb6bee9bc4b73f1f7
2017-11-28 02:09:03 +00:00
Jiyong Park 802ad504e9 Merge "add llndk|vndksp.libraries.txt to vndk_package" am: a4fae6e3e4 -s ours
am: f0e90d0411  -s ours

Change-Id: I5b260e8856dd1742c097be769c6ccd42b53efc57
2017-11-28 02:04:14 +00:00
Jiyong Park f0e90d0411 Merge "add llndk|vndksp.libraries.txt to vndk_package"
am: a4fae6e3e4  -s ours

Change-Id: I408e59939993eed410d5ea95f8c9829fbeff20f1
2017-11-28 01:58:32 +00:00
Treehugger Robot a4fae6e3e4 Merge "add llndk|vndksp.libraries.txt to vndk_package" 2017-11-28 01:48:42 +00:00
Bo Hu 7a099e2f61 Merge "emulator: api 26 fix guest rendering (build)" 2017-11-27 21:04:13 +00:00
Colin Cross 3fec81d978 Add support for jacoco in soong
Use jacoco values exported from soong and copy
jacoco-report-classes.jar to where the jacoco-report-classes-all.jar
rule can find it.

Bug: 69629238
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false
Change-Id: If05381f415fb52a575746b8be0bfcd03d55b2153
2017-11-24 20:23:36 -08:00
Colin Cross 98341ab6d6 Add LOCAL_SRCJARS to clear_vars.mk
I064889c9063b642835d9f668e2568b61d0fabe35 added LOCAL_SRCJARS but
forgot to clear it in clear_vars.mk.

Test: m checkbuild
Change-Id: I7d4e6a3821db0eccb25042091aa599cab381a1b0
2017-11-24 11:26:43 -08:00
Jiyong Park 0845cb5c98 add llndk|vndksp.libraries.txt to vndk_package
Bug: 64882323
Test: build 2017 pixel devices. check the files are under /system/etc.

Merged-In: I488427f796b770bb2d151cfa49f73d323cafbc9f
Change-Id: I488427f796b770bb2d151cfa49f73d323cafbc9f
(cherry picked from commit 686aff5b91)
2017-11-23 14:35:04 +09:00
Andreas Gampe 8093119f51 Merge "Build: Make dex2oat boot image error abort explicit" am: 87dded4494 am: f1d0d93fa2
am: b49b0276ee

Change-Id: I27933d8c90bbe59b7b8935c9ad6a0f983a198251
2017-11-23 02:10:44 +00:00
Andreas Gampe b49b0276ee Merge "Build: Make dex2oat boot image error abort explicit" am: 87dded4494
am: f1d0d93fa2

Change-Id: I305650e2cbc3d523ffa236b282a29da10b3ec469
2017-11-23 02:05:14 +00:00
Andreas Gampe f1d0d93fa2 Merge "Build: Make dex2oat boot image error abort explicit"
am: 87dded4494

Change-Id: I44e5a6cf2fa976dddd882107ffc152a602778fd9
2017-11-23 02:00:05 +00:00
Treehugger Robot 87dded4494 Merge "Build: Make dex2oat boot image error abort explicit" 2017-11-23 01:56:06 +00:00
Colin Cross 69ef0be16a Merge "Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER" am: 711bfabd50 am: 2338f237a3
am: 431ac167d5

Change-Id: I39ebebd031afbb115f30c581f42b5bace7558440
2017-11-22 22:43:00 +00:00
Colin Cross 431ac167d5 Merge "Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER" am: 711bfabd50
am: 2338f237a3

Change-Id: I3bc4845e1e2e3ec8aafafc7a80354738069b67b5
2017-11-22 22:39:59 +00:00
Colin Cross 2338f237a3 Merge "Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER"
am: 711bfabd50

Change-Id: If9f4d81504c26e3d752d4f10f161f9229fb68a8d
2017-11-22 22:37:23 +00:00
Colin Cross 711bfabd50 Merge "Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER" 2017-11-22 22:30:18 +00:00
Andreas Gampe 5ccf0900d0 Build: Make dex2oat boot image error abort explicit
Add explicit arguments that will abort boot image compilation when
a class is found that fails compile-time verification.

This allows certain configurations to disable these checks.

WARNING: Disabling the checks is highly discouraged.

Bug: 69106371
Test: m
Change-Id: I63e915005fcda588b223ec60ef8c9db28d42e577
2017-11-22 14:16:24 -08:00
Lingfeng Yang 207413d056 emulator: api 26 fix guest rendering (build)
As swiftshader is open sourced, put it into emulator
targets to enable -gpu guest option.

Test: build aosp_x86-eng, launch emulator -gpu guest
and it should boot to home screen.

Change-Id: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
2017-11-22 12:45:35 -08:00
Tianjie Xu d4e59044a1 Merge "Fall back to normal split if imgdiff fails when splitting large apks" am: 520c9f0f5f am: ff9efd3290
am: a40db9c53b

Change-Id: I151967860c3d4ddd4c6bcb902f57f3786f8d78bf
2017-11-22 19:09:44 +00:00
Tianjie Xu a40db9c53b Merge "Fall back to normal split if imgdiff fails when splitting large apks" am: 520c9f0f5f
am: ff9efd3290

Change-Id: Ib5215b6cf42973d62023cc1f10750729ad2f52e8
2017-11-22 18:55:40 +00:00
Tianjie Xu ff9efd3290 Merge "Fall back to normal split if imgdiff fails when splitting large apks"
am: 520c9f0f5f

Change-Id: I0db7558c996cc515a79a99ce1d27525728a041dc
2017-11-22 18:46:04 +00:00
Tianjie Xu 520c9f0f5f Merge "Fall back to normal split if imgdiff fails when splitting large apks" 2017-11-22 18:28:31 +00:00
Tianjie Xu f68b50f963 Fall back to normal split if imgdiff fails when splitting large apks
Imgdiff expects the input files to be valid zip archives. During the
split of large apks, imgdiff may fail when there's a hole in the input
file; potentially due to the blocks allocation of mke2fs. This CL solves
the issue by falling back to normal split in case of the imgdiff split
failure. The split transfers will then use bsdiff instead.

Bug: 69624507
Test: generate the incremental package for the failed targets and check the
transfers.
Change-Id: I4882452378123e60ad3434053b57f33e53ac4b82
2017-11-21 23:37:36 -08:00
Colin Cross 3c8d30ce60 Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER
Jack supported '?' and '*' wildcards anywhere in a filter. Tighten
the restrictions to only support '*' at the end of a filter, and
to disallow '?'.  This will allow jacoco support to be built on
top of the existing zip2zip tools.

Add checks that all filters meet the new requirements, and run
the checks outside the LOCAL_EMMA_INSTRUMENT==true check so that
mistakes can be caught without having to run a build with
coverage enabled.

Bug: 69629238
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true
Test: m in internal master
Test: https://android-build.googleplex.com/builds/view-workplan?viewType=Table&workplanId=L67200000122054710&nodeType=Trybot
Change-Id: Ib78bd3c8685fbc6bdcdb517df874186efd1cff33
2017-11-22 01:49:47 +00:00
Tomasz Wasilczyk c926b73549 Merge "Silence yet more superfluous build messages." am: 01e1fe60b8 am: c792d08bd2
am: ddbd872e1d

Change-Id: I9e0d50520328f414e80ac6645c16811c8347775f
2017-11-22 01:30:10 +00:00
Tomasz Wasilczyk ddbd872e1d Merge "Silence yet more superfluous build messages." am: 01e1fe60b8
am: c792d08bd2

Change-Id: I009eb004485f9ce1c818403d5a24712833f44224
2017-11-22 01:27:35 +00:00
Tomasz Wasilczyk c792d08bd2 Merge "Silence yet more superfluous build messages."
am: 01e1fe60b8

Change-Id: I5dc1676389d4b6fb062265fac86a9d77b37c5c7b
2017-11-22 01:25:29 +00:00
Tomasz Wasilczyk 01e1fe60b8 Merge "Silence yet more superfluous build messages." 2017-11-22 01:20:32 +00:00
Vishwath Mohan d608f9bd79 Merge "Use the .cfi variant of a static library where needed." am: 061fcfc254 am: 9cdabdad04
am: d949357589

Change-Id: I149ac15dd6e31799e566bbcf9a45a967ad716f68
2017-11-22 00:20:36 +00:00
Vishwath Mohan d949357589 Merge "Use the .cfi variant of a static library where needed." am: 061fcfc254
am: 9cdabdad04

Change-Id: I74bf38385e3a1102549774fae60219f92943043b
2017-11-22 00:16:00 +00:00
Vishwath Mohan 9cdabdad04 Merge "Use the .cfi variant of a static library where needed."
am: 061fcfc254

Change-Id: I668b215133aa51ad29695fc15f842f4de71645aa
2017-11-22 00:12:17 +00:00
Treehugger Robot 061fcfc254 Merge "Use the .cfi variant of a static library where needed." 2017-11-22 00:05:30 +00:00
Vishwath Mohan 96a130bdaf Use the .cfi variant of a static library where needed.
This CL repoints static dependencies to their .cfi variants for CFI
enabled targets. It also disables CFI for host targets because the
version of ar intended for hosts does not have plugin support (which
CFI requires).

Bug: 67507323
Test: m -j40
Change-Id: Id11afd0c8765469858f406aace2a192afff6d042
2017-11-21 14:08:20 -08:00
Tao Bao 9a49d8ef47 Merge "check_ota_package_signature.py: Set up PYTHONPATH." am: 9f686938da am: 51f5d3360e
am: 56671edd93

Change-Id: Ic7ab87ff1f80a1820758662d3ba1de373c2f8072
2017-11-21 21:47:27 +00:00
Tao Bao 56671edd93 Merge "check_ota_package_signature.py: Set up PYTHONPATH." am: 9f686938da
am: 51f5d3360e

Change-Id: Iadb00273671818cb45df56dedc349356ef6a67ce
2017-11-21 21:44:18 +00:00
Tao Bao 51f5d3360e Merge "check_ota_package_signature.py: Set up PYTHONPATH."
am: 9f686938da

Change-Id: Ie84a386dd6acc44fd1fba987e8f0a5703248cd59
2017-11-21 21:40:13 +00:00