Commit Graph

45882 Commits

Author SHA1 Message Date
Tianjie Xu 4c05f4a41e Rename care map in pb format to care_map.pb
The new suffix distinguishes the new care_map from the ones in plain
text format; and thus the old update_verifier won't report an error
upon parsing failures.

Bug: 115740187
Test: Generate OTA files for Pixels
Change-Id: Ia782afd8cbb0f4bb8c363edaa00e92ab302d5d1b
2018-09-18 15:42:40 -07:00
Colin Cross 15f4979639 Merge changes from topic "manifest_fixer_target_sdk_version"
* changes:
  Make manifest_fixer.py keep targetSdkVersion high with LOCAL_MIN_SDK_VERSION
  Fix setting PRIVATE_MIN_SDK_VERSION on fixed_android_manifest
2018-09-10 23:51:35 +00:00
Colin Cross 5763fd7645 Make manifest_fixer.py keep targetSdkVersion high with LOCAL_MIN_SDK_VERSION
targetSdkVersion should stay as "current" when LOCAL_MIN_SDK_VERSION
is set but LOCAL_SDK_VERSION is not.

Bug: 112438448
Test: atest CtsTelecomTestCases
Change-Id: I72a2dc1073013863f5f8c44f271eace2a4e37a23
2018-09-10 14:41:37 -07:00
Colin Cross fedcf86936 Fix setting PRIVATE_MIN_SDK_VERSION on fixed_android_manifest
full_android_manifest may or may not be equal to
fixed_android_manifest, set PRIVATE_MIN_SDK_VERSION on
fixed_android_manifest instead.

Test: m checkbuild
Change-Id: I21795317a1334ebed772e781aeefba87392a8478
2018-09-10 14:41:37 -07:00
Colin Cross be2ae162f7 Merge "Revert "Add soong_cc_prebuilt.mk"" 2018-09-10 21:36:38 +00:00
Colin Cross 635733b816 Revert "Add soong_cc_prebuilt.mk"
This reverts commit 1bb943b97c.

Reason for revert: broke mac builds
Bug: 113936524

Change-Id: I5b3d8eb1314eb322a5f9c578623ac89e2ad25706
2018-09-10 21:35:55 +00:00
Colin Cross 78104cdd94 Merge changes from topics "make_strip_sh", "soong_cc_prebuilt"
* changes:
  Use build/soong/scripts/strip.sh for Make modules
  Add soong_cc_prebuilt.mk
2018-09-10 19:38:36 +00:00
Colin Cross 830eed81ab Use build/soong/scripts/strip.sh for Make modules
Replace the complicated rules in Make with calls the same strip.sh
script that Soong uses.

Bug: 113936524
Test: m checkbuild
Change-Id: If7beeb8381b5a9bc6e9ba15d443a834eb43fc0d4
2018-09-10 11:05:32 -07:00
Colin Cross 1bb943b97c Add soong_cc_prebuilt.mk
Add soong_cc_prebuilt.mk for Soong modules to use so they can avoid
going through all of prebuilt_internal.mk, dynamic_binary.mk and
binary.mk.  Also moves stripping support into Soong.

Bug: 113936524
Test: m checkbuild
Change-Id: I8b37dda2b449b6b5d48d5b983f43de452f494a1e
2018-09-10 11:04:05 -07:00
Mathew Inwood d72c37eb0a Merge "Support for adding dark greylist members from annotations." 2018-09-10 08:25:46 +00:00
Treehugger Robot 860f9d11a8 Merge "Use the new executable for mkuserimg_mke2fs" 2018-09-08 03:50:32 +00:00
Treehugger Robot 217f0defe9 Merge "Add fastboot HAL to VNDK" 2018-09-08 02:47:40 +00:00
Treehugger Robot 9dcc1d04fb Merge "(make) Add -fsanitize= argument to assembly flags." 2018-09-07 17:23:41 +00:00
Mathew Inwood edb1c84f03 Support for adding dark greylist members from annotations.
Currently, we support maxTargetSdk values of 26 & 28, corresponding to
the P blacklist (existing dark grey list) and upcoming Q blacklist.

For now, just put the two into the same list, as the runtime support to
distinguish between the two does not exist yet.

Bug: 114361293
Test: m
Change-Id: I2f8d206e8dd22afc6c0e98fb5e53b1d78a534125
2018-09-07 16:52:16 +01:00
David Brazdil 5ec2688d71 Merge "Add hidden API public/private list to KATI_RESTAT" 2018-09-07 09:31:37 +00:00
Treehugger Robot adee0d54d0 Merge "ATest: Change module_name from list to single string." 2018-09-07 07:07:13 +00:00
Hridya Valsaraju 3482c89303 Add fastboot HAL to VNDK
Bug: 79480454
Bug: 78793464
Test: make

Change-Id: Ib9fa4161579d666a3276a1a4193b750b64653760
2018-09-06 21:21:16 -07:00
Treehugger Robot 5a3ddef8da Merge "Remove GCC support from Make" 2018-09-07 02:42:27 +00:00
Treehugger Robot 1a9bb089c2 Merge "Use vendor variants of Soong header libraries for vendor modules" 2018-09-07 01:41:10 +00:00
Treehugger Robot 7d1be8148e Merge "Rename to android.test.base.impl" 2018-09-07 01:01:59 +00:00
Colin Cross c47911812d Use vendor variants of Soong header libraries for vendor modules
Mark Soong header libraries with vendor variants as SPLIT_VENDOR
so that Make will use the vendor variant for vendor modules.

Bug: 114238698
Test: m checkbuild
Change-Id: I912ab9f4e19d73a1213d60b9795ee30ca87ef614
2018-09-06 16:25:02 -07:00
Dan Willemsen f063839de9 Remove GCC support from Make
Test: out/build-aosp_arm64.ninja is the same before/after
Test: build_test on downstream branches
Change-Id: If7f8c12f2f288b1e589689361f9457acae634882
2018-09-06 15:40:00 -07:00
David Brazdil e3fb5f6d09 Add hidden API public/private list to KATI_RESTAT
Change hidden API public/private list generation build rule so that it
checks if outputs have changed and only commit them when changes have
been made. .KATI_RESTAT instructs ninja to restat the outputs and remove
reverse dependencies when rebuilding dependencies is not needed.

Bug: 113278235
Test: m appcompat
Change-Id: Iad23e302b6c30f9a021200acd4bb20e6062de5a2
2018-09-06 18:00:57 +01:00
Treehugger Robot 71034e3764 Merge "Adding better AVB error message" 2018-09-06 07:45:34 +00:00
Treehugger Robot 076662d015 Merge "Add care_map_generator as a dependency of BUILT_TARGET_FILES_PACKAGE" 2018-09-06 06:45:28 +00:00
Tao Bao f2dd520c1c Merge "Map numeric dpi value to density bucket for recovery resources." 2018-09-06 04:05:27 +00:00
Bowgo Tsai 99ed1b4fbd Adding better AVB error message
Also removing the requirement of BOARD_BOOTIMAGE_PARTITION_SIZE when
BOARD_AVB_ENABLE is set. Some targets (e.g., emulator) doesn't build
boot.img when AVB is enabled.

Bug: 112293933
Test: build a failure case and checks the error output is expected
Change-Id: I290c707719193ddaedcd9fd0b31de566ad17078c
2018-09-06 09:38:45 +08:00
Steven Moreland 5fd1022106 Merge "Install libbinder_ndk to the system." 2018-09-06 00:04:38 +00:00
Treehugger Robot 58683b1b4d Merge "releasetools: Handle the case of not having ro.vendor.build.fingerprint." 2018-09-05 21:50:17 +00:00
Tianjie Xu 573322279a Use the new executable for mkuserimg_mke2fs
This is in line with the change of mkuserimg_mke2fs.sh to python binary.

Bug: 112555072
Bug: 63866463
Test: unittests pass
Change-Id: I82c0be1e5bbc685edc15120da73aa43fdc9f2f05
2018-09-05 20:52:47 +00:00
Tao Bao ea6cbd0765 releasetools: Handle the case of not having ro.vendor.build.fingerprint.
Commit d572632f3d added support in build
system to blacklist given vendor properties. When
ro.vendor.build.fingerprint gets blacklisted, the OTA generation script
can't rely on those properties to determine a change in vendor images.
This CL considers such a case as "vendor images must have changed"
between the two builds.

Bug: 113892939
Test: Generate an incremental package with builds not having
      ro.vendor.build.fingerprint.
Test: python -m unittest test_ota_from_target_files
Change-Id: I188de9c3cbeecf26132c92b9356e9d5fef75205e
2018-09-05 13:14:55 -07:00
Treehugger Robot 48a575c029 Merge "Remove droiddoc.mk from Make!" 2018-09-05 17:48:43 +00:00
Treehugger Robot 9b165a2bd4 Merge "Add doc update for phony targets" 2018-09-05 02:20:22 +00:00
Dan Willemsen 5fb16a6245 Add doc update for phony targets
Test: view rendered markdown in gitiles
Change-Id: Ifb45b8ab1b27f3eb6b48350da2a4a7a08c7d9e17
2018-09-04 16:27:16 -07:00
Tianjie Xu 19174ba4dc Add care_map_generator as a dependency of BUILT_TARGET_FILES_PACKAGE
This solves the missing host executable when calling
add_img_to_target_files.py.

Bug: 113877667
Test: make target-files-package for aosp_sailfish
Change-Id: I133064ef86a1f9c5b4ec6d27345fb49c61a729e5
2018-09-04 15:33:58 -07:00
Evgenii Stepanov 9b82b3fa34 (make) Add -fsanitize= argument to assembly flags.
It allows use of sanitizer preprocessor macros (like __has_feature())
in assembly files.

Bug: 112438058
Test: SANITIZE_TARGET=hwaddress
Change-Id: If9da7493d69fa2e03649754c38117e36eb8d222c
2018-09-04 14:38:38 -07:00
Nan Zhang 2132fbc7a8 Remove droiddoc.mk from Make!
Test: m -j
Bug: b/70351683, b/78245848
Change-Id: I3348461d742c45d5dae105d26a5c3e8680a08029
2018-09-04 10:54:11 -07:00
Treehugger Robot 0e0ef050f9 Merge "Provisionally increase PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION to 23." 2018-09-03 14:14:37 +00:00
Treehugger Robot 2c341a7b01 Merge "Recognize -Wimplicit-fallthrough." 2018-09-01 01:24:27 +00:00
Treehugger Robot 690e1a17a4 Merge "Switch protoc javastream plugin to using explicit path" 2018-09-01 00:58:26 +00:00
Chih-Hung Hsieh e1672866a7 Recognize -Wimplicit-fallthrough.
Test: warn.py build.log
Change-Id: Ie55248f7348b20d09909a856fe7581a0476b9d9b
2018-08-31 16:19:19 -07:00
Dan Willemsen 5771e8cbf1 Switch protoc javastream plugin to using explicit path
The previous PATH=$PATH:out/... logic was incorrect, since the version
in $PATH would override the one out. And now that we're limiting what's
accessible via $PATH, that caused an error.

Instead, ensure that all protoc plugins are specified explicitly with
--plugin, then remove the PATH modification.

Test: cd frameworks/base/cmds/am; mma    (with protoc-gen-javastream in $PATH)
Change-Id: I6690727504f67f84fdc95ed93eabdf3351e5cb0b
2018-08-31 15:59:23 -07:00
Tao Bao 3e9e6af0ff Merge "releasetools: common.LoadInfoDict() takes a bool parameter for repacking." 2018-08-31 22:08:41 +00:00
Tao Bao 639fe0c7cd Merge "releasetools: Track edify function API changes." 2018-08-31 21:24:31 +00:00
Tri Vo 647e32fa09 Merge "Add android.system.suspend@1.0-service to base_system.mk" 2018-08-31 20:20:49 +00:00
Treehugger Robot 3536f6abe4 Merge "Fix misleading comment in version_defaults.mk" 2018-08-31 19:46:25 +00:00
David Brazdil 89e35e5ca9 Merge "Encode use of private API in manifest" 2018-08-31 09:59:39 +00:00
Treehugger Robot b1230b608f Merge "Add super_empty.img to target-files and the update package." 2018-08-31 01:48:10 +00:00
David Anderson 1ef03e2b79 Add super_empty.img to target-files and the update package.
super_empty.img is needed for "fastboot update" to work, as such, it
must be included in the update package. This change adds lpmake
parameters to misc_info.txt for add_img_to_target_files.py, and ensures
that lpmake is packaged with otatools.zip.

The build-superimage-target macro is now split into two functions - one
to generate the device-specific arguments, and another to build the full
command-line for convenience. The former is used to pass arguments
directly to add_img_to_target_files.

Bug: 113524256
Test: make updatepackage builds and includes super_empty.img
      make otatools includes lpmake

Change-Id: I25091c964b036beeea2a8b8f738e2c18937c1eb4
2018-08-30 16:02:23 -07:00
David Brazdil 354cc2dde6 Merge "Adjust build rule for hidden API list generation" 2018-08-30 17:59:02 +00:00