Commit Graph

49138 Commits

Author SHA1 Message Date
Treehugger Robot 215e2c828c Merge changes I685ab841,I6ab7e488
* changes:
  Add PRODUCT_BUILD_*_IMAGE, BUILDING_*_IMAGE to control building of images
  Always package ext filesystem tools
2019-01-19 00:18:02 +00:00
Colin Cross 103d6e8856 Build docs zips with make docs
The docs zips were being built for make docs dist but not for
make docs.  Add them to ALL_DOCS and to the $(LOCAL_MODULE)
phony rule.

Bug: 123068677
Test: m docs
Test: m ds-docs
Change-Id: I32634c05e392f7a5483c81d59de35ca9bc4d4ad0
2019-01-18 16:08:14 -08:00
Dan Willemsen ec6cc8521d Add previously debug-tagged modules
These all had `LOCAL_MODULE_TAGS := debug`

Test: treehugger
Change-Id: I848d1d9fb7e9921827ef6b5b72376710150ce839
2019-01-18 15:51:41 -08:00
Dan Willemsen 03e61a74a8 Merge "Add PROGUARD_HOME and PROGUARD_DEPS" am: 5f93c3a929
am: 8768ded37b

Change-Id: Ida46e98db111b412656bd3573fc0d313b9a45679
2019-01-18 15:11:40 -08:00
David Brazdil a098903ede Merge "Move HIDDENAPI_FLAGS dependencies to frameworks/base" am: 12e7e928a2
am: 622ad444e9

Change-Id: I4c23dbdd33a81e9efee378a83df6b60880a7a694
2019-01-18 14:49:20 -08:00
Dan Willemsen 8768ded37b Merge "Add PROGUARD_HOME and PROGUARD_DEPS"
am: 5f93c3a929

Change-Id: Ia3427ad28240fb524aa5ddcd37ed169bca62c9df
2019-01-18 14:45:25 -08:00
David Brazdil 622ad444e9 Merge "Move HIDDENAPI_FLAGS dependencies to frameworks/base"
am: 12e7e928a2

Change-Id: Ic17c3b1c6c041afb91a7ea8cb54ddeaea0f5cc41
2019-01-18 14:34:56 -08:00
Treehugger Robot 5f93c3a929 Merge "Add PROGUARD_HOME and PROGUARD_DEPS" 2019-01-18 22:18:50 +00:00
Treehugger Robot 12e7e928a2 Merge "Move HIDDENAPI_FLAGS dependencies to frameworks/base" 2019-01-18 22:13:53 +00:00
Evgenii Stepanov 60beecc90c Limit 2 uses of SANITIZE_TARGET to ASan.
These two places are checking for ifdef(SANITIZE_TARGET) but what
they are really looking for is the second stage of ASan build.

Fix the checks so that they do not apply to HWASan.

I have not seen any change in behavior, but there are some new files
under /system in hwasan build that were not there before, and things
keep working in general, so this feels like the right move.

Bug: 112438058
Test: none; SANITIZE_TARGET=hwaddress keeps working
Change-Id: I4544f408263b908be6ef4a47dd2b5c937e0c1f33
2019-01-18 14:06:11 -08:00
Dan Willemsen 674952098b Add PRODUCT_BUILD_*_IMAGE, BUILDING_*_IMAGE to control building of images
These centralize the decisions on whether to build certain images or
not, and allow the product definition to override that choice.

There are a few use cases here:

 * For GSI-like cases, we only want to build the system image. This
   didn't really change, but it's somewhat simpler to configure, and
   easier to understand the build logic.

 * On the opposite side, when you're planning on using a GSI, the device
   specific build can only build the vendor images (or some other set).

 * Some cases (Fuchsia, etc) don't want to build any images, as they'll
   be distributing the build artifacts in their own packaging.

I suspect in the future, TARGET_BUILD_APPS may be able to be refactored
into the third use case.

Test: treehugger
Test: Create a product definition that includes nothing, try to build it.
Test: compare build-aosp_crosshatch.ninja and build-crosshatch.ninja before/after
Change-Id: I685ab841be3718d3dd7052c28ccd764bb6f1991a
2019-01-18 13:11:34 -08:00
Dan Willemsen df0808331d Always package ext filesystem tools
Every target we have needs these now.

Test: treehugger; codesearch
Change-Id: I6ab7e48887b19f956b2a7aeac78169f0e2035c73
2019-01-18 10:44:34 -08:00
Colin Cross 24d1b201e3 Merge "Separate dexpreopt deps from stripping deps" am: 7cda7650da
am: 9037c76a09

Change-Id: I5ca535f85685afc45cc31d6e273b8e803eb6b458
2019-01-18 07:47:17 -08:00
Colin Cross 9037c76a09 Merge "Separate dexpreopt deps from stripping deps"
am: 7cda7650da

Change-Id: I8aad84eae3e7fc84a74205445e4b4dd8e22189be
2019-01-18 07:42:04 -08:00
Colin Cross 7cda7650da Merge "Separate dexpreopt deps from stripping deps" 2019-01-18 15:34:41 +00:00
David Brazdil 38f19aac1f Move HIDDENAPI_FLAGS dependencies to frameworks/base
Recent move of hiddenapi rules to soong sets the dependencies of
the hiddenapi_flags.csv rule in dex_preopt.mk but doesn't check
for existence of "frameworks/base" as the hiddenapi-generate-csv
rule in frameworks/base. Solve this by removing the dependency
injection and using the SOONG_HIDDENAPI_FLAGS variable directly
in frameworks/base.

This is necessary because go/art-build creates a fake
hiddenapi_flags.csv and if there is a dependency injection rule,
a phony target is created and all dependencies of flags.csv need
to be satisfied.

Test: master-art compiles
Change-Id: I13ef5e7ec167f9372a5629fe1894c7acd4091d29
2019-01-18 15:11:01 +00:00
Jeongik Cha 83c50324ca Define non-system module as variable
Define non_system_module in base_rules.mk when the module is product, vendor,
product_services or proprietary module.

Bug: 74699609

Test: m -j
Change-Id: Iebdd3ec8c643be3d9877b7a96cbdd83465fa3878
2019-01-18 18:24:30 +09:00
Dan Willemsen 4a9a24481d Add PROGUARD_HOME and PROGUARD_DEPS
So that we can pass this into MAINDEXCLASSES.

Fixes: 122988865
Test: OUT_DIR=$HOME/out mmma frameworks/base/core/tests/hosttests/test-apps
Change-Id: I955d3de46d348e3573a6773f69149e7cabab8904
2019-01-17 23:04:27 -08:00
Mark Salyzyn 68fed3ce30 Merge "build_image: Increase spare inodes to 12." am: aa58210dd0
am: fb37e0b6a2

Change-Id: If15f0120fd63197b510095492c51b11c48b0bcd1
2019-01-17 18:24:20 -08:00
Mark Salyzyn fb37e0b6a2 Merge "build_image: Increase spare inodes to 12."
am: aa58210dd0

Change-Id: I4ff9d44984e043c88c31be523297330a20c4e12f
2019-01-17 18:19:03 -08:00
Treehugger Robot aa58210dd0 Merge "build_image: Increase spare inodes to 12." 2019-01-18 02:06:46 +00:00
Colin Cross ded0aec988 Separate dexpreopt deps from stripping deps
The strip rule does not need to wait for the boot image to finish,
create a separate DEXPREOPT_STRIP_DEPS list that only contains
tools used by GenerateStripRule in build/soong/dexpreopt/dexpreopt.go.

Bug: 123038675
Test: m checkbuild
Change-Id: I0814c8d99781533f5778e14547d3e9671e06317f
2019-01-17 16:41:36 -08:00
Colin Cross b1e0d646e6 Merge changes from topics "hiddenapi-soong", "hostdex_install" am: d61a1aba36
am: 9cfe03b9d5

Change-Id: Ie757f3e9c98d121967185b9d909c9b1ed82417fc
2019-01-17 15:30:06 -08:00
Colin Cross 9cfe03b9d5 Merge changes from topics "hiddenapi-soong", "hostdex_install"
am: d61a1aba36

Change-Id: I1e7a8806821414aa68b7309de79668ee6cd86d68
2019-01-17 15:21:35 -08:00
Colin Cross d61a1aba36 Merge changes from topics "hiddenapi-soong", "hostdex_install"
* changes:
  Move hiddenapi to Soong
  Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk
2019-01-17 22:53:24 +00:00
Xin Li 06ff142d70 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master" am: ab9de0ab6e -s ours
am: e2b87fa9be -s ours
am skip reason: subject contains skip directive

Change-Id: I591c3e1a725680a63a4b3f3bc365137bb650a179
2019-01-17 14:19:31 -08:00
Xin Li e2b87fa9be [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master"
am: ab9de0ab6e -s ours
am skip reason: subject contains skip directive

Change-Id: Iec30206046901ce4e87688c4a336c0f26facc6bb
2019-01-17 14:12:56 -08:00
Xin Li 3042c43e27 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master am: dd1f2cf7de -s ours
am: 7c28813adf -s ours
am skip reason: subject contains skip directive

Change-Id: I5cb7fcac9a782b3ddd4ea127a48e5ef5268f3883
2019-01-17 14:02:55 -08:00
Xin Li 7c28813adf [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master
am: dd1f2cf7de -s ours
am skip reason: subject contains skip directive

Change-Id: Icffd0fd4affa17496d22d3d4e48b2ac68296bfa8
2019-01-17 13:51:04 -08:00
Xin Li ab9de0ab6e Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master" 2019-01-17 21:19:43 +00:00
Mark Salyzyn 60fa99d491 build_image: Increase spare inodes to 12.
Test: builds device with DAP
Change-Id: I816a7da54bbe23d4eb1140ac0d101c0fee175f0a
2019-01-17 11:30:12 -08:00
Nicolas Geoffray f30bffd1b7 Merge "dex_preopt: differentiate between updatable boot jars and non-updatable boot jars." am: 85437e248d
am: f2c2fe0707

Change-Id: I23ab55d3405046846e6fd85ec8e435b417804a96
2019-01-17 10:27:14 -08:00
Colin Cross 49adea3bd8 Move hiddenapi to Soong
Perform hiddenapi CSV generation and dex encoding for Soong modules
in Soong.  This fixes an issue where dexpreopting was happening on
a different jar than was being installed.

Bug: 122856783
Test: m checkbuild
Change-Id: I24a235c63ff62fed7e1af9f2fd17e55b0c1598a5
2019-01-17 10:23:10 -08:00
Colin Cross 83b7bdf765 Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk
Simplify importing Soong modules into Make by always copying
LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets
Soong pick the final output file instead of trying to figure
out which of the various intermediate files should be the
output file.

Also fixes an issue where hostdex modules could attempt to
copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE),
which are the same file for host java modules.

Test: set compile_dex:true on core.platform.api.stubs. no warnings
      of target overriding
Test: m checkbuild

Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-17 10:23:06 -08:00
Nicolas Geoffray f2c2fe0707 Merge "dex_preopt: differentiate between updatable boot jars and non-updatable boot jars."
am: 85437e248d

Change-Id: I922fdc3879c4a39bcfe59f8f6311e47ad44231d0
2019-01-17 10:19:22 -08:00
Nicolas Geoffray 85437e248d Merge "dex_preopt: differentiate between updatable boot jars and non-updatable boot jars." 2019-01-17 18:08:13 +00:00
Tianjie Xu e8be9168fe Merge "blockimgdiff: selectively convert 'diff' commands to 'new' to reduce stash size" am: ffc87ac0a7
am: 4046b8f741

Change-Id: If6ad6cc16e5758f48ed79c3291e77c2321bd5a86
2019-01-17 09:22:55 -08:00
Tianjie Xu 4046b8f741 Merge "blockimgdiff: selectively convert 'diff' commands to 'new' to reduce stash size"
am: ffc87ac0a7

Change-Id: I38af15ee6b7a6e59017fc89e6f01ce661675b40c
2019-01-17 09:15:41 -08:00
Tianjie Xu ffc87ac0a7 Merge "blockimgdiff: selectively convert 'diff' commands to 'new' to reduce stash size" 2019-01-17 16:54:04 +00:00
Nicolas Geoffray 6ce12f56de dex_preopt: differentiate between updatable boot jars and non-updatable boot jars.
bug: 119868597
Test: m
Change-Id: I2f12ed6f37b629effc30e7b0c3310dc32e5ff4c8
2019-01-17 14:35:41 +00:00
Sundong Ahn 529ce6eabc [automerger skipped] Merge "Change the impl lib name of java_sdk_library" am: 0a8750b3da
am: c2214aaaff -s ours
am skip reason: change_id I275cd40e3682640b96425e56698cea770888cbb1 with SHA1 ab48e20448 is in history

Change-Id: Idec49de46ba41f41db91ae2a07cdda3708936d77
2019-01-17 02:25:51 -08:00
Sundong Ahn c2214aaaff Merge "Change the impl lib name of java_sdk_library"
am: 0a8750b3da

Change-Id: I5a6c118818778d34c24ff609da6884c2efcaedc3
2019-01-17 02:12:38 -08:00
Treehugger Robot 0a8750b3da Merge "Change the impl lib name of java_sdk_library" 2019-01-17 10:01:37 +00:00
Sundong Ahn a9f2ef5ed1 Change the impl lib name of java_sdk_library
The impl lib name of java_sdk_library is changed to {module_name}.jar
instead of {module_name}.impl.jar

Bug: 110404779
Test: m -j
Change-Id: I275cd40e3682640b96425e56698cea770888cbb1
Merged-In: I275cd40e3682640b96425e56698cea770888cbb1
(cherry picked from commit 0372f189ac)
2019-01-17 09:42:57 +09:00
TreeHugger Robot 3a60ed49bb Merge "Change the impl lib name of java_sdk_library" into pi-dev-plus-aosp 2019-01-17 00:40:52 +00:00
xunchang b6105dcba3 blockimgdiff: selectively convert 'diff' commands to 'new' to reduce stash size
We cannot simultaneously stash more blocks than the size limit imposed by
the cache size. As a result, some 'diff' commands will be inevitably
converted to new. We used to do this conversion blindly when iterating
through the transfer list. This leads to an unintended large package.

In order to choose the right transfers to convert, we calculate the size
of the compressed data, and build a heuristic about the package size
increase to remove each stash blocks. After the process, the given
package size for the watch device further reduces from 186M->155M.

In some rare cases, the removed stashed blocks don't directly contribute
to the maximum simultaneously stashed size. For example,
stash A: 10 blocks
stash B: 5 blocks
free B: 5 blocks  <-- stash B has been freed before we reach max stashed blocks
stash C: 10 blocks

Converting these blocks lead to an uncertain result. On one hand, patches
are generally smaller than the new data; while on the other hand, the
regenerated graph may have fewer order violation and thus give some size
reduction. But these cases are rare and it seems an overkill to consider all
possible scenarios here.

Bug: 120561199
Test: build non-A/B incrementals and check the size
(p.s. it can be tested on all target files with customed cache threshold)
Change-Id: I599420a91b80f1a1d83d22ee1b336b699050cfb4
2019-01-16 12:59:13 -08:00
Yifan Hong 7f7e2635cb Merge "Generate OTA for non-A/B devices with dynamic partitions" am: 885787f4d3
am: 4b0f34da5d

Change-Id: I76ad575bf821f693b2879af5926ffd8abe73fc7e
2019-01-16 10:58:14 -08:00
Mark Salyzyn 34c0af7a11 Merge "build_image: right-sizing at least some spare inode" am: f2f1854ca4
am: f92eb52866

Change-Id: I80f5a8b6b53a043ff8e2b1ac0717dd19b43ea981
2019-01-16 10:56:25 -08:00
Yifan Hong 4b0f34da5d Merge "Generate OTA for non-A/B devices with dynamic partitions"
am: 885787f4d3

Change-Id: I3df4f51fbb8111b0e6b0845921cd7949e5771c4c
2019-01-16 10:50:59 -08:00
Mark Salyzyn f92eb52866 Merge "build_image: right-sizing at least some spare inode"
am: f2f1854ca4

Change-Id: I14a099d227eb69dd595e58c641bb29181c2be9d5
2019-01-16 10:49:21 -08:00