Commit Graph

49480 Commits

Author SHA1 Message Date
Tom Cherry 43fa4a9985 Merge "Fix failing test_fs_config_generator.py tests" am: f83ba4e8b1
am: cff9af302b

Change-Id: Idde025803213c7f952e326065647ae41d1b8350b
2019-02-13 20:58:38 -08:00
Yifan Hong 99576a5d38 Merge "DAP: system_as_root can't be true." am: bee89836c7
am: b97fa33969

Change-Id: Ic016a1fb624f9bb2048c2759d542a4f45ba1b3f5
2019-02-13 20:32:22 -08:00
Logan Chien 4129464c5c Merge changes I2f2a7df5,I84ff9f61 am: e083c26a19
am: 8cf536529c

Change-Id: I21c85998565610e3473948144fdf157a7082b829
2019-02-13 20:31:27 -08:00
Tom Cherry cff9af302b Merge "Fix failing test_fs_config_generator.py tests"
am: f83ba4e8b1

Change-Id: I70fc52b006407fc749057b74c2599eac2e4c5392
2019-02-13 20:30:13 -08:00
Yifan Hong b97fa33969 Merge "DAP: system_as_root can't be true."
am: bee89836c7

Change-Id: I37b164da2f9171413090032976aebf71de04a5a5
2019-02-13 20:25:43 -08:00
Logan Chien 8cf536529c Merge changes I2f2a7df5,I84ff9f61
am: e083c26a19

Change-Id: I49b1cb979a4d5940054ae0fd7250e84d898d78cd
2019-02-13 20:14:36 -08:00
Tom Cherry f83ba4e8b1 Merge "Fix failing test_fs_config_generator.py tests" 2019-02-14 02:18:11 +00:00
Treehugger Robot bee89836c7 Merge "DAP: system_as_root can't be true." 2019-02-14 02:09:20 +00:00
Logan Chien e083c26a19 Merge changes I2f2a7df5,I84ff9f61
* changes:
  Check ELF files in both paths
  Add system shared libs to a prebuilt_internal.mk path
2019-02-14 01:53:27 +00:00
Pirama Arumuga Nainar 80381f8a06 Merge "Enable coverage only when LOCAL_SDK_VERSION > 23" am: 5aab10f40d
am: f5119676e9

Change-Id: I5b9d563e8656da3137ae9749aaf45ffae6ac9de5
2019-02-13 16:44:54 -08:00
Pirama Arumuga Nainar f5119676e9 Merge "Enable coverage only when LOCAL_SDK_VERSION > 23"
am: 5aab10f40d

Change-Id: Icd16e3925dfe4605aac91840dc094f5eb26afdae
2019-02-13 16:25:33 -08:00
Colin Cross da37ee584c Merge "Make copy-many-files take an optional destination directory" am: ceaf716a3d
am: e95dc4e3cc

Change-Id: Idc0fee93d1f37ab74ca29fcccc9268140e9c3639
2019-02-13 16:10:16 -08:00
Martin Stjernholm 689a580f8d Merge "Disable installation of ART modules in /system." am: 6747fb91bb
am: 49305909a8

Change-Id: I71cc9e6d4adc58e5b00011daf37086387ab2be5b
2019-02-13 16:08:17 -08:00
Pirama Arumuga Nainar 5aab10f40d Merge "Enable coverage only when LOCAL_SDK_VERSION > 23" 2019-02-14 00:05:57 +00:00
Bill Peckham 36b230c394 Merge "Skip some build steps if not building system image." am: 4a3c68bffa
am: 8a4041a18e

Change-Id: I17249226965c48c599da4a6f932e4d63b0c7a5d0
2019-02-13 15:59:50 -08:00
Colin Cross e95dc4e3cc Merge "Make copy-many-files take an optional destination directory"
am: ceaf716a3d

Change-Id: I980f01aebab53ce670dff9f1080c0d9c85d895d4
2019-02-13 15:52:04 -08:00
Martin Stjernholm 49305909a8 Merge "Disable installation of ART modules in /system."
am: 6747fb91bb

Change-Id: I0dd463952899afbe421e99529e7cb3c421ecd61c
2019-02-13 15:16:09 -08:00
Bill Peckham 8a4041a18e Merge "Skip some build steps if not building system image."
am: 4a3c68bffa

Change-Id: I8f54ec1dd481867714b9af1b537d00504f821bc8
2019-02-13 15:15:21 -08:00
Colin Cross ceaf716a3d Merge "Make copy-many-files take an optional destination directory" 2019-02-13 23:11:38 +00:00
Yifan Hong f84c7e5c8f DAP: system_as_root can't be true.
Test: builds
Change-Id: I3e47e9717c983703494abc8417526caf5955d2e4
Fixes: 124274480
2019-02-13 15:08:33 -08:00
Treehugger Robot 6747fb91bb Merge "Disable installation of ART modules in /system." 2019-02-13 23:08:01 +00:00
Bill Peckham 4a3c68bffa Merge "Skip some build steps if not building system image." 2019-02-13 22:57:35 +00:00
Bill Peckham cc57de3256 Skip some build steps if not building system image.
tools/releasetools/add_img_to_target_files.py: This patch excludes the
inclusion of the system path into the target files if it does not exist (which
it will not if we are not building the system image).

Bug: 123430711
Test: Disable building system image, verify that target files builds without system.
Change-Id: Iaf964ede2b1df5ea4e004b572fd91187a366e75e
2019-02-13 22:57:14 +00:00
Tom Cherry 766adc9cbc Fix failing test_fs_config_generator.py tests
Also run pylint and yapf to fix the style issues.

Test: these same tests
Change-Id: I0a783f7a6f08a90f615d94e9d16da0f314b7813f
2019-02-13 14:34:42 -08:00
Martin Stjernholm a568592f53 Disable installation of ART modules in /system.
Remove ART modules (`art-runtime`, `art-tools`) from `PRODUCT_PACKAGES`, as
they are provided by the Android Runtime APEX module
(`com.android.runtime`).

Copy of rpl's http://r.android.com/812674.

Test: Flash and boot
Test: atest CtsJniTestCases
Test: atest CtsJdwpTestCases
Test: m checkbuild dist
Bug: 113373927
Change-Id: I3e0c130f1a9c596629ab243648f0251cf71c1499
2019-02-13 22:28:09 +00:00
Tianjie Xu 89527442c9 Merge "Code improvement to adjusted the blocks size for care_map file" am: b8ac90803c
am: 9cdba9ba97

Change-Id: I67efdb6a6c8e186c706b35f0dc4984d2bafc7c99
2019-02-13 12:24:07 -08:00
Tianjie Xu 9cdba9ba97 Merge "Code improvement to adjusted the blocks size for care_map file"
am: b8ac90803c

Change-Id: I0655a9a76996aac812c738ee62b9d1fdfda4eea9
2019-02-13 12:15:47 -08:00
Tianjie Xu b8ac90803c Merge "Code improvement to adjusted the blocks size for care_map file" 2019-02-13 19:49:48 +00:00
Shashikant Baviskar 16a73897c3 Code improvement to adjusted the blocks size for care_map file
Bug: 123931528
Test: python -m unittest test_add_img_to_target_files
Change-Id: I589bc9681bccfa07588cab94f53f69d637d6f0f9
2019-02-13 18:34:50 +00:00
Colin Cross dc53f450af Make copy-many-files take an optional destination directory
Test: m checkbuild
Change-Id: I777952d27bd1a0cf2608e080a0f46e39268784ce
2019-02-13 08:03:25 -08:00
Nicolas Geoffray 7b66ef4a57 Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""" am: cd75414f1e
am: 3ac7c3e373

Change-Id: I9e38c739277b4bcd31c13d2e24e45586790201f2
2019-02-13 04:14:42 -08:00
Nicolas Geoffray 3ac7c3e373 Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system."""
am: cd75414f1e

Change-Id: Ie2582c55e4f4cf2304ce3edc97345530c1b58190
2019-02-13 04:10:14 -08:00
Nicolas Geoffray cd75414f1e Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""" 2019-02-13 11:59:39 +00:00
Anton Hansson cda7b88b7d Merge "Move dump-products back to the config stage" am: 2582554c42
am: b893eaed97

Change-Id: Ifad27bb8b916a71ad7e81e48324f2fdfa9ffbee1
2019-02-13 01:26:35 -08:00
Anton Hansson b893eaed97 Merge "Move dump-products back to the config stage"
am: 2582554c42

Change-Id: I2e836577b19ed8e055b3c951a9eb001d551622a2
2019-02-13 01:22:26 -08:00
Anton Hansson 2582554c42 Merge "Move dump-products back to the config stage" 2019-02-13 09:12:30 +00:00
Justin Yun fd6dfb3734 Merge "Add an option not to install all VNDK libs" am: 95c7f58bb7
am: 3385d3f2ff

Change-Id: I2de30ad08e0818958d705effc04ccf1d1519e930
2019-02-12 23:42:40 -08:00
Justin Yun 3385d3f2ff Merge "Add an option not to install all VNDK libs"
am: 95c7f58bb7

Change-Id: I8f08f7c9bca79b5c27551000e5c13ae295330fcc
2019-02-12 23:38:30 -08:00
Treehugger Robot 95c7f58bb7 Merge "Add an option not to install all VNDK libs" 2019-02-13 07:30:58 +00:00
Dan Willemsen cf9865ee4d Merge "Support loading only approved vendorsetup.sh files" am: 9f814c284f
am: df2ed6bf67

Change-Id: If713307479728413acd49934af051e41cb1281ce
2019-02-12 21:05:10 -08:00
Dan Willemsen df2ed6bf67 Merge "Support loading only approved vendorsetup.sh files"
am: 9f814c284f

Change-Id: I306f870d58efc0f134b88552020ed963fd8ca929
2019-02-12 20:53:09 -08:00
Treehugger Robot 9f814c284f Merge "Support loading only approved vendorsetup.sh files" 2019-02-13 04:19:38 +00:00
Justin Yun 89443aed80 Add an option not to install all VNDK libs
When using VNDK snapshot, current VNDK libs are not required. Use
"TARGET_SKIP_CURRENT_VNDK=true" to skip installing current VNDK libs.

Bug: 123607022
Test: TARGET_SKIP_CURRENT_VNDK=true PRODUCT_EXTRA_VNDK_VERSIONS=28 m -j
Change-Id: I65c902c71a7952536bbf824a1dccb9360e843f1a
2019-02-13 10:46:10 +09:00
Colin Cross bccabe6d4b Merge "Move dexpreopt image selection out of dexpreopt_gen" am: 8f4e0f2939
am: 5755b02cfe

Change-Id: I137ba4bf924f2b044f05034893bde9521849b754
2019-02-12 17:20:37 -08:00
Colin Cross 5755b02cfe Merge "Move dexpreopt image selection out of dexpreopt_gen"
am: 8f4e0f2939

Change-Id: I55321f2af249bf5a7c2c644b7dc6408439be3ecd
2019-02-12 17:15:31 -08:00
Colin Cross 8f4e0f2939 Merge "Move dexpreopt image selection out of dexpreopt_gen" 2019-02-13 01:00:49 +00:00
Dan Willemsen d855a72ebe Support loading only approved vendorsetup.sh files
Very few vendorsetup.sh files are needed anymore, since add_lunch_combo
has been deprecated. So add a way so that only approved vendorsetup.sh
files can be loaded into the shell, and others will be skipped.

This further limits the amount of code that can run outside the build
sandbox, and makes this list more visible to tree maintainers before
they're used instead of after.

Test: no allowed-vendorsetup_sh-files
Test: empty allowed-vendorsetup_sh-files
Test: one file in allowed-vendorsetup_sh-files
Test: two files in allowed-vendorsetup_sh-files
Test: non-present file in allowed-vendorsetup_sh-files
Change-Id: Ia23d1c9d11a7295d5be5abd10cf56edbdec80483
2019-02-12 15:52:36 -08:00
Bowgo Tsai 140735a1ef Merge "Adding per-partition SPL into AVB prop descriptors" am: cb52058f8f
am: e0b388d5ba

Change-Id: If6ea6e7b3c1df63f5dc096b06305b02ba8c9f86e
2019-02-12 15:49:11 -08:00
Dan Willemsen 5371a6f48f Merge "Obsolete add_lunch_combo" am: 5afd3dc00e
am: cff18343d4

Change-Id: Iffa9289d5065cf8739996caf72ae04433ad94bd2
2019-02-12 15:48:04 -08:00
Bowgo Tsai e0b388d5ba Merge "Adding per-partition SPL into AVB prop descriptors"
am: cb52058f8f

Change-Id: Ifec9cc5738bf7d332ecd93daf71bacc490b6acb3
2019-02-12 15:44:28 -08:00