Commit Graph

42865 Commits

Author SHA1 Message Date
Tao Bao 91391637f9 Merge "releasetools: Make validate_target_files.py pylint clean." am: a4c7d59afc am: 41a3a414f0
am: dc68afc7f0

Change-Id: Ic5ea0d13816cfa889608e48414e34763b61c8112
2018-02-02 14:46:15 +00:00
Tao Bao dc68afc7f0 Merge "releasetools: Make validate_target_files.py pylint clean." am: a4c7d59afc
am: 41a3a414f0

Change-Id: I5fdbf2a22e7219846e5673c1368b018b414cbf50
2018-02-02 06:59:17 +00:00
Tao Bao 41a3a414f0 Merge "releasetools: Make validate_target_files.py pylint clean."
am: a4c7d59afc

Change-Id: I3b9e9c15493bcf5b7d88de7161bcc9405d31ea4d
2018-02-02 03:21:03 +00:00
David Brazdil 8c4d521d0d Merge "Revert "Revert "Apply hiddenapi build tool on boot jars""" am: edd4716ff9 am: bc05d3f846
am: 3264b568f3

Change-Id: I21ce7dc6f2d50a96722a197f52e48f13899ede7d
2018-02-01 23:27:09 +00:00
Treehugger Robot a4c7d59afc Merge "releasetools: Make validate_target_files.py pylint clean." 2018-02-01 23:23:46 +00:00
Tao Bao bb20e8c5f2 releasetools: Make validate_target_files.py pylint clean.
C: 73, 0: Wrong hanging indentation (add 4 spaces).
      file_name, actual_sha1, expected_sha1)
      ^   | (bad-continuation)
C:171, 0: Wrong continued indentation (add 20 spaces).
        'SYSTEM/etc/recovery.img', expected_recovery_sha1)
        ^                   | (bad-continuation)
C:185, 0: Wrong continued indentation (add 20 spaces).
        file_path='IMAGES/boot.img', expected_sha1=boot_info[3])
        ^                   | (bad-continuation)
C:191, 0: Wrong continued indentation (add 20 spaces).
        file_path='IMAGES/recovery.img',
        ^                   | (bad-continuation)
C:192, 0: Wrong continued indentation (add 20 spaces).
        expected_sha1=expected_recovery_sha1)
        ^                   | (bad-continuation)
W: 67,15: Use % formatting in logging functions and pass the % parameters as arguments (logging-format-interpolation)
W:150,17: Use % formatting in logging functions and pass the % parameters as arguments (logging-format-interpolation)
W:153,15: Use % formatting in logging functions and pass the % parameters as arguments (logging-format-interpolation)
W:194,15: Use % formatting in logging functions and pass the % parameters as arguments (logging-format-interpolation)
C: 27, 0: standard import "import logging" comes before "import common" (wrong-import-order)
C: 28, 0: standard import "import os.path" comes before "import common" (wrong-import-order)
C: 29, 0: standard import "import re" comes before "import common" (wrong-import-order)
C: 31, 0: standard import "import sys" comes before "import common" (wrong-import-order)

Test: pylint --rcfile=pylintrc validate_target_files.py
Test: Run validate_target_files.py with a target-files.zip.
Change-Id: Ie64acdb4cee4326938c4ad5a34b575d7b82478c0
2018-02-01 12:03:17 -08:00
David Brazdil 3264b568f3 Merge "Revert "Revert "Apply hiddenapi build tool on boot jars""" am: edd4716ff9
am: bc05d3f846

Change-Id: I8f196d102137ec2f0c48776a911b495bd1361d74
2018-02-01 19:30:19 +00:00
David Brazdil bc05d3f846 Merge "Revert "Revert "Apply hiddenapi build tool on boot jars"""
am: edd4716ff9

Change-Id: Ib56d4cddae86552b1c58f0bc3ea8f7e0f51216e0
2018-02-01 13:53:38 +00:00
David Brazdil edd4716ff9 Merge "Revert "Revert "Apply hiddenapi build tool on boot jars""" 2018-02-01 09:25:51 +00:00
Tao Bao d870401863 Merge "releasetools: Move the AVB salt setup into common.LoadInfoDict()." am: 4b4c3d91b0 am: 19bd39fe3f
am: d2bc1b9718

Change-Id: I995829e85bfdfb7024212e1c6427c00934db303d
2018-02-01 00:48:07 +00:00
Tao Bao d2bc1b9718 Merge "releasetools: Move the AVB salt setup into common.LoadInfoDict()." am: 4b4c3d91b0
am: 19bd39fe3f

Change-Id: I4b8271f022b7c27420cf8b0b6532b2cced0bd44f
2018-02-01 00:26:52 +00:00
Tao Bao 19bd39fe3f Merge "releasetools: Move the AVB salt setup into common.LoadInfoDict()."
am: 4b4c3d91b0

Change-Id: If2a9e3100bb9350fc2cdd0c8265b7f7492736889
2018-02-01 00:17:20 +00:00
Treehugger Robot 4b4c3d91b0 Merge "releasetools: Move the AVB salt setup into common.LoadInfoDict()." 2018-02-01 00:06:46 +00:00
Tao Bao 12d87fc174 releasetools: Move the AVB salt setup into common.LoadInfoDict().
We used to do this in add_img_to_target_files.AddImagesToTargetFiles(),
which didn't cover the path when calling from make_recovery_patch. As a
result, /system/bin/install-recovery.sh contains different SHA values
from the actual images.

Test: Set up aosp_bullhead to use AVB. `m dist`, then run the following
      command to verify the generated install-recovery.sh.

  $ ./build/make/tools/releasetools/validate_target_files.py \
      out/dist/aosp_bullhead-target_files-eng.zip

Change-Id: Id7be8fb17072252fcd4d08db2057b8c4af053376
2018-01-31 12:25:10 -08:00
Bowgo Tsai e419d370da Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 5e7d417271 am: 897c432036
am: 8f03b86120

Change-Id: I4b38dcd1cc0f85c61c57d113df02fc45a714649d
2018-01-31 14:51:51 +00:00
Bowgo Tsai 8f03b86120 Merge "Renames sepolicy files from nonplat_* to vendor_*" am: 5e7d417271
am: 897c432036

Change-Id: I7f445103859d40551c398b220c41e7ec96b5bd89
2018-01-31 14:49:12 +00:00
Bowgo Tsai 897c432036 Merge "Renames sepolicy files from nonplat_* to vendor_*"
am: 5e7d417271

Change-Id: If380c487fbdf89a14bddb1d46ee937ee9277395e
2018-01-31 14:46:35 +00:00
Treehugger Robot 5e7d417271 Merge "Renames sepolicy files from nonplat_* to vendor_*" 2018-01-31 14:37:44 +00:00
Tianjie Xu 54ec40b263 Merge "Protect SparseImage._GetRangeData() with lock" am: 5edd2821de am: e517144ac9
am: c3b193255b

Change-Id: I752d1921fddc4de293698f42973930d4bca72e9e
2018-01-30 23:51:38 +00:00
Tianjie Xu c3b193255b Merge "Protect SparseImage._GetRangeData() with lock" am: 5edd2821de
am: e517144ac9

Change-Id: I075d7daacaf92def5233a18243f12cde4ff8db6f
2018-01-30 23:49:35 +00:00
Tianjie Xu e517144ac9 Merge "Protect SparseImage._GetRangeData() with lock"
am: 5edd2821de

Change-Id: I977e98df87e6a8854cb3f93fc20ffb2f62cd532a
2018-01-30 23:47:00 +00:00
Tianjie Xu 5edd2821de Merge "Protect SparseImage._GetRangeData() with lock" 2018-01-30 23:34:50 +00:00
David Brazdil b8fa6dd104 Revert "Revert "Apply hiddenapi build tool on boot jars""
This reverts commit 4a2926a44e.

Reason for revert: The original CL caused two issues:
1) Increased app startup because `profman` failed to verify boot
jars and created an empty profile for the boot image. All methods
in the framework therefore ran interpreted/JITed. New flag
"--skip-apk-verification" has been added to `profman` to fix
the issue in CL Iad614e47feada293218c11cff985a8012ca49a0f.
2) Caused a crash in Mockito CTS tests because jvmti did not
remove hiddenapi access flags from boot jars before using them.
This has been fixed with CL Ibc9a96a6b541c06844f276db009ac29514f7a3bb.

Bug: 64382372
Bug: 72550707
Test: make test-art-host
Change-Id: Ie8c58714455662f042f56b2977b01b75c5ec7d2f
2018-01-30 18:25:46 +00:00
Paul Duffin d45daf6191 Merge "Conditionally remove atb from bootclasspath" 2018-01-30 11:20:50 +00:00
Bowgo Tsai 8b5f514038 Renames sepolicy files from nonplat_* to vendor_*
Bug: 64240127
Test: boot an existing device
Change-Id: I6d6ac7d9dee450b2a20649e5f4dbb8976f48061e
2018-01-30 16:15:12 +08:00
Dan Willemsen bd2f15cd58 Merge "Clean up some kati warnings" am: 157fbf771b am: 6432cf64b6
am: 6597699c8d

Change-Id: If7fe1940d10ff759c4606c314f98030fad83b232
2018-01-30 07:53:15 +00:00
Dan Willemsen 6597699c8d Merge "Clean up some kati warnings" am: 157fbf771b
am: 6432cf64b6

Change-Id: I49dac5cbfb0dac0c6302775f1e3defeaff8c2dcb
2018-01-30 07:50:37 +00:00
Dan Willemsen 6432cf64b6 Merge "Clean up some kati warnings"
am: 157fbf771b

Change-Id: Ib3a38e2b544900f6961c9af9d71ff1762c4fb02a
2018-01-30 07:48:08 +00:00
Dan Willemsen 157fbf771b Merge "Clean up some kati warnings" 2018-01-30 07:43:27 +00:00
Pirama Arumuga Nainar 4103f7701e Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR" am: d33cac8af1 am: 7760fdff02
am: 64e15096e5

Change-Id: I4149b8650a3d1234034355f88a38f97e41a0abba
2018-01-30 06:48:03 +00:00
Pirama Arumuga Nainar 64e15096e5 Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR" am: d33cac8af1
am: 7760fdff02

Change-Id: I1369ae7e4518d2ed86fee465a4276f20a412eabf
2018-01-30 06:45:58 +00:00
Pirama Arumuga Nainar 7760fdff02 Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR"
am: d33cac8af1

Change-Id: I059548084c60592998518986c9c09e3eab145965
2018-01-30 06:40:56 +00:00
Treehugger Robot d33cac8af1 Merge "Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR" 2018-01-30 06:34:15 +00:00
Andreas Gampe a9e3f4f36c Merge "Warn.py: Update errorprone categories" am: 709ee786cd am: 2192dda42a
am: 7417ece30a

Change-Id: I1f62020caa042fa00533e13da14c69dd1aeecccf
2018-01-30 02:16:04 +00:00
Andreas Gampe 7417ece30a Merge "Warn.py: Update errorprone categories" am: 709ee786cd
am: 2192dda42a

Change-Id: If813b0e077ecf356ac82ece41a9eef2bde6ab242
2018-01-30 02:13:56 +00:00
Andreas Gampe 2192dda42a Merge "Warn.py: Update errorprone categories"
am: 709ee786cd

Change-Id: I6fb3ff3712f841d67b58af90931c3d735ed5746a
2018-01-30 02:11:51 +00:00
Treehugger Robot 709ee786cd Merge "Warn.py: Update errorprone categories" 2018-01-30 02:05:19 +00:00
Dan Willemsen 893bebc44b Clean up some kati warnings
Kati has a `--warn` option that adds some extra Kati-specific warnings
-- like using undefined make functions, undefined user functions, likely
bad variable lookups, etc. Some of these are bugs, others are fine doing
nothing. This fixes up all of them in the core build system.

It also complains about $(eval) usage in a recipe not being recommended.
Those aren't handled as part of this change.

Bug: 72661763
Test: build-aosp_arm.ninja is identical before and after
Change-Id: I8e00af142a7745236d3ad4efc9e91ec3ce71a511
2018-01-29 16:23:37 -08:00
Pirama Arumuga Nainar ae9595674b Write SOONG_MODULES_MISSING_PGO_PROFILE_FILE to $DIST_DIR
Bug: http://b/72642679

Store missing profile files and the modules that refer to them, passed
via SOONG_MODULES_MISSING_PGO_PROFILE_FILE variable, to
$DIST_DIR/pgo_profile_file_missing.txt as part of the 'dist' target.

Test: 'm dist' and verify creation of pgo_profile_file_missing.txt.
Change-Id: I4ac0a1f413cbb99b33ad1903aeebd3ebcf3b9f59
2018-01-29 14:48:08 -08:00
Tri Vo b97219cf3e Merge "Fix /sys denials." am: d8e3c4eb07 am: 55bb62895e
am: abdf6ef257

Change-Id: I54779227cbea868c6577b9df409fff7315562100
2018-01-29 22:22:58 +00:00
Tri Vo abdf6ef257 Merge "Fix /sys denials." am: d8e3c4eb07
am: 55bb62895e

Change-Id: I6507cb7c04af3e61984ea57dea553f13386403cb
2018-01-29 22:15:38 +00:00
Tri Vo 55bb62895e Merge "Fix /sys denials."
am: d8e3c4eb07

Change-Id: Icef6458b50ef11744bdcfd19ed22b678d06f45b3
2018-01-29 22:12:17 +00:00
Treehugger Robot d8e3c4eb07 Merge "Fix /sys denials." 2018-01-29 22:04:32 +00:00
Tianjie Xu 6b3a9f8a40 Merge "Double check the sha1 for ranges during package generation" am: 92d73d3ab9 am: e62b278865
am: 65ac13cf08

Change-Id: I9aff2f5580681386cc63eadf8b567bd986d195e0
2018-01-29 20:03:43 +00:00
Tianjie Xu 65ac13cf08 Merge "Double check the sha1 for ranges during package generation" am: 92d73d3ab9
am: e62b278865

Change-Id: Icc1145a71430470ee9ef44043cd4b3532207bed9
2018-01-29 20:00:05 +00:00
Tianjie Xu e62b278865 Merge "Double check the sha1 for ranges during package generation"
am: 92d73d3ab9

Change-Id: Ieb23111a1e42240c5a9754a3ee4dd50ec055f823
2018-01-29 19:57:29 +00:00
Tianjie Xu df1166e92f Protect SparseImage._GetRangeData() with lock
The generator function is not thread safe and is prone to race
conditions. This CL uses a lock to protect this generator and loose the
locks elsewhere, e.g. 'WriteRangeDataToFd()'.

Bug: 71908713
Test: Generate an incremental package several times for angler 4208095 to 4442250.
Change-Id: I9e6f0a182a1ba7904a597f403f2b12fe05016513
2018-01-29 11:52:10 -08:00
Tianjie Xu 92d73d3ab9 Merge "Double check the sha1 for ranges during package generation" 2018-01-29 19:50:08 +00:00
Paul Duffin e2819d8456 Conditionally remove atb from bootclasspath
If REMOVE_ATB_FROM_BCP=true then this adds the
framework-atb-backward-compatibility library to the bootclasspath.

Otherwise, it adds the android.test.base library instead.

Bug: 30188076
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I3c15c35724426a9cdeef398c5bc4f5176a8fc752
2018-01-29 11:48:42 +00:00
Tobias Thierer ebbbb5b1a2 Merge "javac 9 -target 1.9: Move bootclasspath jars onto classpath." am: e1b94da7c8 am: 6f1cb62ed4
am: 57e6177293

Change-Id: I588c93bfaa3f39405118452d4aa401f84f28c3e4
2018-01-29 11:01:12 +00:00