Commit Graph

41565 Commits

Author SHA1 Message Date
Kevin Cheng a733c5b3ee Merge "Add local compatibilty suite info to module-info.json." am: ada8948b9a am: 0026cf4d5b
am: be6e0d066b

Change-Id: I6135c3a7c0b0c71038b5a13deb266432578cfb08
2017-11-29 20:50:30 +00:00
Kevin Cheng be6e0d066b Merge "Add local compatibilty suite info to module-info.json." am: ada8948b9a
am: 0026cf4d5b

Change-Id: I944e2ddb1a03f349b1678b9c1ce63c4e03ea45e8
2017-11-29 20:38:00 +00:00
Kevin Cheng 0026cf4d5b Merge "Add local compatibilty suite info to module-info.json."
am: ada8948b9a

Change-Id: I6b8c3da9231bf4cb0d3a9aae12e3b0d8e25cef8c
2017-11-29 20:30:47 +00:00
Treehugger Robot ada8948b9a Merge "Add local compatibilty suite info to module-info.json." 2017-11-29 20:20:25 +00:00
Bowgo Tsai 17f564ed8d Merge "Reorder assert-max-image-size and AVB signing" am: 8552bebed4 am: 91676f9154
am: d2daa37931

Change-Id: I171fa5e811f0f258e1a07236a9d64e64ce17428a
2017-11-29 09:24:47 +00:00
Bowgo Tsai d2daa37931 Merge "Reorder assert-max-image-size and AVB signing" am: 8552bebed4
am: 91676f9154

Change-Id: If32fe42e5cddd41664deafb58ccb1c02aa2ee56b
2017-11-29 09:21:09 +00:00
Bowgo Tsai 91676f9154 Merge "Reorder assert-max-image-size and AVB signing"
am: 8552bebed4

Change-Id: I9f8c0e513cee50740b31b26c18e72c9c7284b5c1
2017-11-29 09:17:35 +00:00
Treehugger Robot 8552bebed4 Merge "Reorder assert-max-image-size and AVB signing" 2017-11-29 09:10:27 +00:00
Bowgo Tsai 63a913d4a7 Merge "Include vbmeta.img into <product>-img.zip" am: 047aab7c3b -s ours am: da087e573f -s ours
am: a73ccef1ab  -s ours

Change-Id: Id0c10bfebb5335b0517198482b2e02f5c6c42df4
2017-11-29 08:43:17 +00:00
Bowgo Tsai a73ccef1ab Merge "Include vbmeta.img into <product>-img.zip" am: 047aab7c3b -s ours
am: da087e573f  -s ours

Change-Id: Ibb109ecac6d58ef476590447553449b5b1c49bca
2017-11-29 08:39:16 +00:00
Bowgo Tsai da087e573f Merge "Include vbmeta.img into <product>-img.zip"
am: 047aab7c3b  -s ours

Change-Id: Ifa48e48d51ece7354ac1dcef824a5199bd3f8820
2017-11-29 08:34:35 +00:00
Treehugger Robot 047aab7c3b Merge "Include vbmeta.img into <product>-img.zip" 2017-11-29 08:26:24 +00:00
Bowgo Tsai 6a74979a3b Include vbmeta.img into <product>-img.zip
Bug: 65227202
Test: make dist, checks vbmeta.img is included in <product>-img.zip
Merged-In: I3e09f036441bcf7e98d8f76360df1e17466ae38e
Change-Id: I3e09f036441bcf7e98d8f76360df1e17466ae38e
(cherry picked from commit 6bbb11a620)
2017-11-29 16:14:19 +09:00
Michael Schwartz 2cc95a0e52 Merge "Support prebuilt bootimage" am: 52a4f7d2b7 am: 465197ed16
am: 366ba1e30d  -s ours

Change-Id: If6a821036442eaa2c67396e6036d2be985263997
2017-11-29 05:03:35 +00:00
Michael Schwartz 366ba1e30d Merge "Support prebuilt bootimage" am: 52a4f7d2b7
am: 465197ed16

Change-Id: Ibd6f0f298f78735fd1978a4e7956c5f4aa0e665f
2017-11-29 04:55:54 +00:00
Michael Schwartz 465197ed16 Merge "Support prebuilt bootimage"
am: 52a4f7d2b7

Change-Id: I6f84da11655b151b65c4e3913fc14aa8b6631b97
2017-11-29 04:52:49 +00:00
Treehugger Robot 52a4f7d2b7 Merge "Support prebuilt bootimage" 2017-11-29 04:44:20 +00:00
TreeHugger Robot e0682e6dbe Merge "Enable VNDK runtime checking" 2017-11-29 03:55:30 +00:00
Dan Willemsen 86229fe250 Merge "Mark envsetup.sh vars as deprecated in makefiles" am: d7fcf6f459 am: efe230cef6
am: 7aa261d33e

Change-Id: I36b948d3ad430f22d8d8c969f3806a0efec32a50
2017-11-29 03:29:20 +00:00
Dan Willemsen 7aa261d33e Merge "Mark envsetup.sh vars as deprecated in makefiles" am: d7fcf6f459
am: efe230cef6

Change-Id: Icb40e3041e47fe87d7d1a9ee5112a66aa297be55
2017-11-29 03:25:21 +00:00
Dan Willemsen efe230cef6 Merge "Mark envsetup.sh vars as deprecated in makefiles"
am: d7fcf6f459

Change-Id: I7da6187dc23bf7e74dbb7e8b686380070f565f70
2017-11-29 03:18:43 +00:00
Treehugger Robot d7fcf6f459 Merge "Mark envsetup.sh vars as deprecated in makefiles" 2017-11-29 03:06:32 +00:00
TreeHugger Robot 8c925b7f49 Merge "Added test suite specific libs." 2017-11-29 02:33:25 +00:00
Kevin Cheng 2260918434 Add local compatibilty suite info to module-info.json.
Test: m out/target/product/<lunch target>/module-info.json
And I see the following line in module-info.json:

"CtsSampleHostTestCases": { "class": ["JAVA_LIBRARIES"],  "path":
["cts/hostsidetests/sample"],  "tags": ["tests"],  "installed":
["out/host/linux-x86/framework/CtsSampleHostTestCases.jar"],
"compatibility_suites": ["cts",  "general-tests",  "vts"] },

Change-Id: I67a78de4153c762977b145ed62ca8b6ecd0b7947
2017-11-28 15:27:04 -08: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
Dan Willemsen 773386251d Mark envsetup.sh vars as deprecated in makefiles
For the envsetup.sh variables that should not be used in makefiles
(since they're not explicitly set up, and won't be available on the
build servers), mark them as deprecated.

Rework our documentation to have a landing page, and create a "Changes"
section where we can record changes like these. At some point I may go
and backfill some recent work.

Test: build/soong/build_test.bash
Change-Id: I54b9294ddf270245afdb58d17150db8098584e8a
2017-11-28 14:19:50 -08: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
Siyuan Zhou 1888315487 Added test suite specific libs.
Change-Id: Iab18a8c0e118c957f8ee3dfa258d3a72351ce4db
2017-11-28 10:31:40 -08:00
Michael Schwartz 0dc6f21779 Support prebuilt bootimage
Bug: 63676296
Test: `m -j` and inspect artifacts
Merged-In: Id32d8a7151a8e99b45aa58ee9971def9734eaf78
Change-Id: Id32d8a7151a8e99b45aa58ee9971def9734eaf78
(cherry picked from commit b0b1a24b1e)
2017-11-28 20:18:34 +09: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