Commit Graph

37016 Commits

Author SHA1 Message Date
Yueyao Zhu 211c90158c Makefile: support build and avb signing of dtbo img
Test: make with corresponding configurations in BoardConfig.mk
- dtbo.img is copied to the OUT directory
- avbtool info_image --image dtbo.img shows avb hashes
- avbtool info_image --image vbmeta.img shows dtbo partition info

Bug: 37730955
Change-Id: If3edaab860926c743f18fd031c911b076eb09fab
2017-04-27 14:49:39 -07:00
Chih-Hung Hsieh ef21d1458b Get Android TOP from build.log file.
find_android_root works only when warn.py is found
so it works for build bot, but not when warn.py is
run against a stand alone build.log file.
Now get the TOP directory path from build.log
if it is found.

Bug: 37725427
Test: warn.py --gencsv build.log
Change-Id: I7b776c2e71a8d8d769f0600b08abe37acbd6ce7c
2017-04-27 10:25:37 -07:00
Joe LaPenna 0f35ca4165 Merge "Remove NetworkRecommendation from platform." into oc-dev
am: e5181610d4

Change-Id: Ib86914507b37842863c122d83eebdddf69b8ae9c
2017-04-27 16:51:11 +00:00
Joe LaPenna e5181610d4 Merge "Remove NetworkRecommendation from platform." into oc-dev 2017-04-27 16:45:15 +00:00
Tao Bao b398d18f94 Merge "Revert "Revert "Add compatibility metadata to OTA package""" am: f9937b5c24 am: 5e15d3cce1
am: 925147dd7d

Change-Id: If2f21fa653b05f14c3534090a98258c925006c81
2017-04-27 16:27:27 +00:00
Tao Bao 925147dd7d Merge "Revert "Revert "Add compatibility metadata to OTA package""" am: f9937b5c24
am: 5e15d3cce1

Change-Id: Icf50f5a83cc0dc5d0db413f6b4daea532bfbb9f8
2017-04-27 16:24:10 +00:00
Tao Bao 5e15d3cce1 Merge "Revert "Revert "Add compatibility metadata to OTA package"""
am: f9937b5c24

Change-Id: I1673c92ae8985e8ef681ea91a89ff237232be931
2017-04-27 16:21:40 +00:00
Tao Bao f9937b5c24 Merge "Revert "Revert "Add compatibility metadata to OTA package""" 2017-04-27 16:12:57 +00:00
Mark Salyzyn c1b0993552 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" am: d0020fafe2 am: 151e856015
am: de12e39af7

Change-Id: I4352677bec833b32c6c6a2acf86276d5fa7ed72a
2017-04-27 15:49:35 +00:00
Mark Salyzyn de12e39af7 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" am: d0020fafe2
am: 151e856015

Change-Id: I6aae6d254471f48c1af0ce80c58ac890831c49fe
2017-04-27 15:44:38 +00:00
Mark Salyzyn 151e856015 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES"
am: d0020fafe2

Change-Id: I9af881f708c619e9da5b7b5204bbd58dd52d6195
2017-04-27 15:39:35 +00:00
Mark Salyzyn d0020fafe2 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" 2017-04-27 15:33:29 +00:00
Mark Salyzyn eb8dc72724 fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES
Misspelled fs_config_generate_extra_partition_list when used to
calculate LOCAL_REQUIRED_MODULES dependencies.  This resulted in
fs_config_dirs and fs_config_files failing to generate the vendor,
oem or odm variants (ie: fs_config_files_vendor)

Test: build generates correct fs_config override files.
Bug: 37721445
Bug: 36071012
Change-Id: I053dd5cdb357c7cea05a5ff63b0686bd0bc99df6
2017-04-27 08:01:27 -07:00
Nicolas Geoffray 2987311985 resolve merge conflicts of 225fd8057f to oc-dev-plus-aosp
Test: build

Change-Id: Iae46079ffda4ef5d6b1408044bfcb786ac08a7a6
2017-04-27 13:51:08 +01:00
Nicolas Geoffray 225fd8057f Merge "Update build files to new compiler filters." am: 6c8c20dd5b
am: 39568a6783

Change-Id: Ic31ecc16969b15f961f8126bade07a7daf42ec9d
2017-04-27 11:56:38 +00:00
Nicolas Geoffray 39568a6783 Merge "Update build files to new compiler filters."
am: 6c8c20dd5b

Change-Id: I01c7d2d2500d1d5c64cf8f1ed9d2901309ca9edd
2017-04-27 11:49:44 +00:00
Nicolas Geoffray 6c8c20dd5b Merge "Update build files to new compiler filters." 2017-04-27 11:40:07 +00:00
Tao Bao 4bede622dc Merge "Revert "Revert "Add compatibility metadata to OTA package""" into oc-dev
am: cc2bfa484e

Change-Id: Ief6654d9b1f6d4f355b792806b809e9378a32b4a
2017-04-26 21:30:53 +00:00
Tao Bao 21803d3574 Revert "Revert "Add compatibility metadata to OTA package""
This reverts commit b1e59b8a73.

This CL enables generating compatibility zip entry in an A/B OTA
package. We're not enabling the support for non-A/B OTAs for now until
they have the necessary support (e.g. /proc/config.gz exists).

Bug: 36810913
Test: Generate full and incremental packages for marlin and applly under
      normal boot and sideload respectively.

Change-Id: I69f0a3feb7a0efc7f727f92f31c9e63f47ee6530
(cherry picked from commit b63c952cc7)
2017-04-26 14:28:46 -07:00
Tao Bao cc2bfa484e Merge "Revert "Revert "Add compatibility metadata to OTA package""" into oc-dev 2017-04-26 21:23:41 +00:00
Mark Salyzyn 0934979502 Merge changes I44289a3d,I0537453b,I23a655b1 am: 7928afb83d am: b6650076ad
am: 6d63c8a7d5

Change-Id: I2165562709fdebf98c90958299ed23079b41f080
2017-04-26 14:47:57 +00:00
Mark Salyzyn 6d63c8a7d5 Merge changes I44289a3d,I0537453b,I23a655b1 am: 7928afb83d
am: b6650076ad

Change-Id: I11596ccd4816c7558c3a82c7959b10bc5b183a59
2017-04-26 14:44:56 +00:00
Mark Salyzyn b6650076ad Merge changes I44289a3d,I0537453b,I23a655b1
am: 7928afb83d

Change-Id: I9d9b429bb855e0051bfb26ddc01453c7221fce23
2017-04-26 14:41:59 +00:00
Mark Salyzyn 7928afb83d Merge changes I44289a3d,I0537453b,I23a655b1
* changes:
  fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm)
  fs_config_generate: add -P <partitionlist> option
  fs_config_generate: unit test
2017-04-26 14:36:43 +00:00
Narayan Kamath db37b37afa Merge "Update stale comment for dalvik.vm.stack-trace-file." am: 5b50433f19 am: ba8e91ded3
am: 1898053ffb

Change-Id: Ibd01e7463a69995a31c721c1922a0fb7ce459a14
2017-04-26 08:36:01 +00:00
Narayan Kamath 1898053ffb Merge "Update stale comment for dalvik.vm.stack-trace-file." am: 5b50433f19
am: ba8e91ded3

Change-Id: I82652e5bd3c00f8f9dfd7cf25d94502f43431832
2017-04-26 08:33:01 +00:00
Narayan Kamath ba8e91ded3 Merge "Update stale comment for dalvik.vm.stack-trace-file."
am: 5b50433f19

Change-Id: I52e974e8fba0d4a7d546ed30cf0099b60f589afc
2017-04-26 08:30:00 +00:00
Narayan Kamath 5b50433f19 Merge "Update stale comment for dalvik.vm.stack-trace-file." 2017-04-26 08:23:49 +00:00
Joe LaPenna 885f8f7576 Remove NetworkRecommendation from platform.
It no longer provides platform functionality, so can be removed.

Bug: 37357264,37686309
Test: make aosp_bullhead-userdebug and make bullhead-userdebug
Change-Id: Iedaa1dd764678f12eaeda292e6047485aae236ac
2017-04-25 19:16:28 -07:00
Dan Willemsen 0bf506f44a Exempt UBSAN runtime library from soong_to_convert
Soong already uses it, just not as a prebuilt module.

Test: Compare soong_to_convert.txt before/after
Change-Id: I6ffa0d967635d52b7b4f8b2b0465cd50254f22b9
2017-04-25 16:26:43 -07:00
Mark Salyzyn 1fd588cfb2 fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm)
Add build targets to generate the vendor, oem and odm slices of the
fs_config_dirs and fs_config_files targets for each of the respective
filesystems, and automatically trigger the individual and enabled
partition build objects based as dependents of fs_config_dirs and
fs_config_files.

Sensitive to the following board definition pairs:

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE  BOARD_USES_VENDORIMAGE
BOARD_OEMIMAGE_FILE_SYSTEM_TYPE     BOARD_USES_OEMIMAGE
BOARD_ODMIMAGE_FILE_SYSTEM_TYPE     BOARD_USES_ODMIMAGE

Which when defined and set means the images are generated for vendor,
oem or odm respectively.

Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)'
      and check the expected products, or fails if not pertinent.
Test: build for product that produces split to system and vendor and
      subsequently boots with vendor products correctly configured.
Bug: 36071012
Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-04-25 15:09:09 -07:00
Mark Salyzyn 256d339413 fs_config_generate: add -P <partitionlist> option
Add a -P option to fs_config_generate that allows us to filter on
a comma separated partition whitelist or minus prefixed -blacklist.
A partition is defined as accessible as <partition>/ or
system/<partition>/.

No change for legacy, where no -P flag is specified.

For system.img, but not vendor, oem or odm file references:
fs_config_generate -P -vendor,-oem,-odm

For vendor.img file references:
fs_config_generate -P vendor

For oem.img file references:
fs_config_generate -P oem

For odm.img file references:
fs_config_generate -P odm

Add and fortify tests for each of these cases.

SideEffects: none
Test: gTest host fs_config-unit-test
Bug: 36071012
Change-Id: I0537453bb289d41ef98ad76e69f78ae49358a1b3
2017-04-25 15:09:01 -07:00
Mark Salyzyn 5649b31a17 fs_config_generate: unit test
Test -D and -F flag of fs_config_generate

Test: gTest host fs_config-unit-tests
Bug: 36071012
Change-Id: I23a655b17b7c55817f2aacc760700ff1b0728db3
2017-04-25 15:08:56 -07:00
Tao Bao b63c952cc7 Revert "Revert "Add compatibility metadata to OTA package""
This reverts commit b1e59b8a73.

This CL enables generating compatibility zip entry in an A/B OTA
package. We're not enabling the support for non-A/B OTAs for now until
they have the necessary support (e.g. /proc/config.gz exists).

Bug: 36810913
Test: Generate full and incremental packages for marlin and applly under
      normal boot and sideload respectively.

Change-Id: I69f0a3feb7a0efc7f727f92f31c9e63f47ee6530
2017-04-25 15:04:41 -07:00
Jiyong Park f63ac32ad6 Merge "Embed jni libs in vendor apks for treble-ized devices" am: 5aada52ffb am: 7423f3ab11
am: bc70f0a30e

Change-Id: I33e2f20cffd4f7b8593c752bf36f1041f6594672
2017-04-25 21:21:15 +00:00
Jiyong Park bc70f0a30e Merge "Embed jni libs in vendor apks for treble-ized devices" am: 5aada52ffb
am: 7423f3ab11

Change-Id: I0914d19415abb366a147e51a4eb5deefea4a2b6c
2017-04-25 21:17:44 +00:00
Jiyong Park 7423f3ab11 Merge "Embed jni libs in vendor apks for treble-ized devices"
am: 5aada52ffb

Change-Id: I10902684187e4b6db4f8a8ec3921d19c07edf13c
2017-04-25 21:15:14 +00:00
Treehugger Robot 5aada52ffb Merge "Embed jni libs in vendor apks for treble-ized devices" 2017-04-25 21:06:35 +00:00
Vikas Marwaha e560372ab2 Merge "Added make files for variable Nougat MR1" am: b27fb9f528 am: d7214ec091
am: 3c11b00837

Change-Id: I390e249cea2024d88f481dba853f21160226710c
2017-04-25 20:34:41 +00:00
Vikas Marwaha 3c11b00837 Merge "Added make files for variable Nougat MR1" am: b27fb9f528
am: d7214ec091

Change-Id: I2aeb46876fc225fdc2da0d2448104c87bc0d0ed9
2017-04-25 20:28:11 +00:00
Vikas Marwaha d7214ec091 Merge "Added make files for variable Nougat MR1"
am: b27fb9f528

Change-Id: I769d1c1058cc629d5fcb8008669f6cf11caafd33
2017-04-25 20:23:39 +00:00
Vikas Marwaha b27fb9f528 Merge "Added make files for variable Nougat MR1" 2017-04-25 20:15:44 +00:00
George Burgess IV ce662c40f4 Merge "warn.py: have URLs open in new tabs" am: 7ffb8c8fa8 am: 2f6f02d812
am: 763e59213d

Change-Id: I7ec4e89370c007d28dd0db5ceafd80ae9f15a94f
2017-04-25 17:17:25 +00:00
George Burgess IV 763e59213d Merge "warn.py: have URLs open in new tabs" am: 7ffb8c8fa8
am: 2f6f02d812

Change-Id: I4bfe3edae21350b80983a96b05afa068f902fb45
2017-04-25 17:14:25 +00:00
George Burgess IV 2f6f02d812 Merge "warn.py: have URLs open in new tabs"
am: 7ffb8c8fa8

Change-Id: I34c7c05cae50f7696be969c87d781c1a5ff7df54
2017-04-25 17:12:25 +00:00
Treehugger Robot 7ffb8c8fa8 Merge "warn.py: have URLs open in new tabs" 2017-04-25 17:05:09 +00:00
Narayan Kamath d5068605f9 Update stale comment for dalvik.vm.stack-trace-file.
Test: make
Change-Id: Ia14494b146f58937aed203271be340747817519b
2017-04-25 15:41:04 +01:00
Nicolas Geoffray 0576b5f24e Update build files to new compiler filters.
bug:34715556
Test: build and boot aosp bullhead
Change-Id: I95c7bbabd68a58206e8c79a017337a7f9a518569
2017-04-25 12:25:33 +01:00
Dan Willemsen 96706ae223 Merge "Overridden packages shouldn't install vdex files either" into oc-dev
am: 387d93f0a9

Change-Id: I6b7f127b4329ab9f6816c9db439f00d6bfdbf43a
2017-04-25 06:25:14 +00:00
TreeHugger Robot 387d93f0a9 Merge "Overridden packages shouldn't install vdex files either" into oc-dev 2017-04-25 06:21:43 +00:00