1. 29 Oct, 2015 2 commits
    • Dan Willemsen's avatar
      Revert "Remove changing uids/timestamps from zip/jar files" · b589ae4e
      Dan Willemsen authored
      This reverts commit 3c2c064c.
      
      zipalign depends on libandroidfw, and some setups don't include frameworks/base.
      
      Bug: 24201956
      Change-Id: I48ee95808924f6b2221f0a49ab205c2565096b1f
      b589ae4e
    • Dan Willemsen's avatar
      Remove changing uids/timestamps from zip/jar files · 3c2c064c
      Dan Willemsen authored
      Pass -X to zip so that Unix UID/GID and extra timestamps aren't
      saved into the zip files.
      
      Add a new option to zipalign, -t, to replace all timestamps with static
      timestamps (2008 Jan 1 00:00:00). Use this for all non-APK zip files.
      APK zip timestamps are set based on the certificate date in SignApk.
      
      Bug: 24201956
      Change-Id: Ifb619fc499ba9d99fc624f2acd5f8de36d78ef8e
      3c2c064c
  2. 28 Oct, 2015 2 commits
    • Ying Wang's avatar
      Fix "make product-graph" and "make dump-products". · 67132baa
      Ying Wang authored
      - For unmodified "make product-graph" and "make dump-products",
        load only the current product configuration makefiles. This is much
        faster than loading all product makefiles.
      - For "make product-graph ANDROID_PRODUCT_GRAPH=--all",
        "make dump-products ANDROID_DUMP_PRODUCTS=all", load all product
        makefiles.
      - Move product-graph.mk out of build tasks, so we can skip loading all
        the Android.mks, which takes long and we don't really need them.
        More importantly, with all product makefiles loaded, modules in
        Android.mks are prone to clash (if they are conditionally included
        by variables set up in product makefiles) and lead to parse-time
        error.
      
      Change-Id: Idc1d6b0c23eb2c8bb34fdd7a1fa4d56171768d21
      67132baa
    • Tao Bao's avatar
      Honor TARGET_NO_RECOVERY flag. · db45efa6
      Tao Bao authored
      Don't generate recovery.img when calling 'make dist' if
      TARGET_NO_RECOVERY is set. The build system passes the flag to the
      packaging script which then generates recovery.img conditionally.
      
      Bug: 25329471
      Change-Id: Ifbc999300d5c31e897878f81e231ae7dd2aca660
      db45efa6
  3. 23 Oct, 2015 2 commits
    • Tao Bao's avatar
      Bump up the BBOTA version to 4. · eba409c4
      Tao Bao authored
      To accommodate new changes (such as error correction in [1]) to BBOTA
      in N release. We bump up the version to keep the OTA script backward
      compatible.
      
      Needs the matching CL in commit
      1fdec8685af858c5ff4f45d2e3059186ab5ed2ab.
      
      [1]: commit 0a7b47397db3648afe6f3aeb2abb175934c2cbca
      
      Change-Id: Ib9158b455cd5905fe2d4742ce81feb1b7583054f
      eba409c4
    • Alex Deymo's avatar
      Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS. · 49be2b11
      Alex Deymo authored
      In order to have all the A/B updater variables in the same AB_OTA_
      namespace we rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
      
      Bug: None
      Test: `make dist` includes the partitions.txt file if properly configured.
      
      Change-Id: Ied4faabd7e2f0ab8a5007afb44ad2f38df8d630d
      49be2b11
  4. 14 Oct, 2015 2 commits
    • Steve Fung's avatar
      Add the Product ID to target_files.zip · 22d624a9
      Steve Fung authored
      When using the A/B updater, include the product id string to
      target_files.zip.
      This is needed by the Omaha backend.
      
      Bug: 24946811
      Change-Id: I2ce5f6cffe440c29a1820348ee215c71cec07861
      22d624a9
    • Sami Tolvanen's avatar
      Error correction: Append codes to verified partitions · f99b5314
      Sami Tolvanen authored
      Append error-correcting codes to verified partitions provided that
      PRODUCT_SUPPORTS_VERITY_FEC is true.
      
      This moves verity metadata to be after the hash tree, and requires
      matching changes from
        Ide48f581bbba77aed6132f77b309db71630d81ed
      
      Bug: 21893453
      Change-Id: I6945cbab99e214566a1f9d3702333f2dbbc35816
      f99b5314
  5. 08 Oct, 2015 1 commit
  6. 03 Oct, 2015 1 commit
  7. 02 Oct, 2015 1 commit
    • Alex Deymo's avatar
      Pack META/ab_partitions.txt when using the A/B OTA updater. · 8925d334
      Alex Deymo authored
      The list of A/B partitions updated is product-specific. Normally you
      would update boot and system, but the product could require to update
      other partitions during a system update. This patch packages the list
      of A/B partitions configured to be updated when using the A/B updater.
      The list can be set in the product makefile by setting the make
      variable UPDATE_AB_PARTITIONS.
      
      Bug: 24387863
      Test: `make dist` creates the META/ab_partitions.txt in the target_files.zip
      
      Change-Id: I4226ab05c7c7cd74721b06f1da64c6cf4d0e52ac
      8925d334
  8. 30 Sep, 2015 1 commit
    • Alex Deymo's avatar
      Pack the update_engine_config.txt when using the A/B OTA updater. · 70067acd
      Alex Deymo authored
      This config file pulled directly from the source specifies the update
      payload version supported by the code. When generating an incremental
      update payload for the A/B updater, the generated payload format will
      match the version supported by the old version.
      
      Bug: 24406755
      Test: `make dist` on Brillo.
      
      Change-Id: Ib7ac6828d0d34eb31e786dbaae5d59ecf26c3576
      70067acd
  9. 28 Sep, 2015 1 commit
    • Tao Bao's avatar
      Pack libdivsufsort.so into otatools.zip. · f6d83021
      Tao Bao authored
      This is to support the change to bsdiff which depends on
      libdivsufsort.so and libdivsufsort64.so now.
      
      Bug: 24332905
      Change-Id: I232fc1b2abda67456f012a83fa4f69a99bc6ea14
      f6d83021
  10. 26 Sep, 2015 1 commit
    • Steve Fung's avatar
      Package breakpad symbols in target files zip · dfbab49b
      Steve Fung authored
      When BREAKPAD_GENERATE_SYMBOLS is set to true, package the breakpad
      symbols into the target files zip thats generated with `make dist`.
      
      Bug: 24165970
      Change-Id: I11c0d9a9d9e159475bfdb7bc338f9e9ac60aeada
      dfbab49b
  11. 22 Sep, 2015 1 commit
  12. 18 Sep, 2015 1 commit
  13. 15 Sep, 2015 1 commit
    • Ying Wang's avatar
      Generate installed-files-vendor.txt · 8da19e36
      Ying Wang authored
      Similar to installed-files.txt, installed-files-vendor.txt lists the
      content of vendor.img.
      
      Bug: 24009297
      Change-Id: Ib8112b19cc9f54d0c0d6a829063e4fe72d8ce664
      8da19e36
  14. 26 Aug, 2015 1 commit
  15. 24 Aug, 2015 1 commit
    • Doug Zongker's avatar
      add otatools-package target · 32bf3f32
      Doug Zongker authored
      Add a target to zip up all the otatools and releasetools, for easy
      copying to the OTA builder machine.
      
      Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
      (cherry picked from commit f22b0f43)
      32bf3f32
  16. 19 Aug, 2015 1 commit
  17. 12 Aug, 2015 4 commits
    • Dianne Hackborn's avatar
      Fix issie #23116383: Include security patch level in Settings · e593e5c4
      Dianne Hackborn authored
      Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
      e593e5c4
    • Dan Willemsen's avatar
      Use repeatable timestamps · ccc933e9
      Dan Willemsen authored
      This moves all of the date references under build/ to using a single
      datetime that can be set manually using BUILD_DATETIME.
      
      It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
      redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
      BUILD_DATETIME.
      
      Bug: 23117013
      Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
      ccc933e9
    • Dan Willemsen's avatar
      Revert "Use repeatable timestamps" · 92026f2d
      Dan Willemsen authored
      OSX `date` doesn't understand -d
      
      This reverts commit 13ba6e00.
      
      Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
      92026f2d
    • Dan Willemsen's avatar
      Use repeatable timestamps · 13ba6e00
      Dan Willemsen authored
      This moves all of the date references under build/ to using a single
      datetime that can be set manually using BUILD_DATETIME.
      
      It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
      redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
      BUILD_DATETIME.
      
      Bug: 23117013
      Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
      13ba6e00
  18. 11 Aug, 2015 1 commit
    • Ying Wang's avatar
      Don't build otapackage on Mac. · 09c4b68d
      Ying Wang authored
      Also removed the unneeded variable DISTTOOLS
      and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.
      
      Bug: 23085297
      Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
      09c4b68d
  19. 10 Aug, 2015 1 commit
    • Ying Wang's avatar
      Allow custom recovery resource dirs. · 9a175686
      Ying Wang authored
      Set TARGET_PRIVATE_RES_DIRS in your BoardConfig.mk to specify custom
      private recovery resource directories.
      With this change you can share the same recovery resource dir for more
      than one device; Also you can specify more than one directories.
      
      Change-Id: Ieeb18f5ac11c98b6f08d0ab6fb4e0d9aa72b27e7
      9a175686
  20. 05 Aug, 2015 1 commit
    • Tao Bao's avatar
      build: Support packaging for system_root_image. · 62bd479f
      Tao Bao authored
      If system image contains the root directory
      (BOARD_BUILD_SYSTEM_ROOT_IMAGE == "true"), we package the root directory
      into ROOT/ instead of BOOT/RAMDISK/ in the target_files zip.
      
      Change-Id: I817776ca97194991308b2131d0e34ab136283464
      62bd479f
  21. 04 Aug, 2015 1 commit
    • Stephen Smalley's avatar
      build: switch over to file_contexts.bin only · d3a803e6
      Stephen Smalley authored
      
      Change all uses of the file_contexts file to use the
      file_contexts.bin file instead.
      
      Depends on
         I75a781100082c23536f70ce3603f7de42408b5ba
         I43806d564b83d57f05f5c36c8eba7b1ff4831b04
         Id560d093440a2aba99cef28c20133b35feebf950
         I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400
      
      Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
      Signed-off-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
      d3a803e6
  22. 31 Jul, 2015 2 commits
    • Daniel Rosenberg's avatar
      build: core: Fix issue in recovery · 7b826569
      Daniel Rosenberg authored
      Now that symlinks are created at build time, the rsync while
      making recovery runs into issues around the etc symlink
      
      Change-Id: Ie781507b22e4661629840075b274eaab2f712de6
      7b826569
    • Daniel Rosenberg's avatar
      Add ro.build.system_root_image · 59156a6b
      Daniel Rosenberg authored
      ro.build.system_root_image is true if the root directory is built
      into the system image.
      
      Change-Id: I17208ebd004c63aebb09db6c3e5f795619e73bd2
      59156a6b
  23. 30 Jul, 2015 1 commit
    • Tao Bao's avatar
      build: Fix "adb shell" in recovery for system_root_image. · be46a545
      Tao Bao authored
      For system images that contain the root directory, "adb shell" in
      recovery stops working if the image is mounted at "/system", because
      sh now locates at /system/system/bin/sh. We fix the issue by mounting
      the image on /system_root and create a symlink to /system_root/system
      for /system.
      
      Bug: 22855115
      Change-Id: Ia6b257b75aeb67687c3909063d1725a23a5ccd60
      be46a545
  24. 28 Jul, 2015 1 commit
    • Tao Bao's avatar
      Support systems that use a full copy of recovery image. · f2cffbdd
      Tao Bao authored
      If BOARD_USES_FULL_RECOVERY_IMAGE == true, a full copy of recovery
      image will be carried as /system/etc/recovery.img instead of a patch
      at /system/recovery_from_boot.p.
      
      Bug: 22641135
      Change-Id: Ie271d3e2d55d7b003f667ac5b44203d69b23c63b
      (cherry picked from commit 8beab69b)
      f2cffbdd
  25. 21 Jul, 2015 1 commit
  26. 18 Jul, 2015 1 commit
    • Colin Cross's avatar
      Read BUILD_NUMBER from file in rules · f37b4558
      Colin Cross authored
      Using $(BUILD_NUMBER) inside a rule causes odd behavior, as the rule
      is different every time make is run, but since make doesn't depend
      on the command line it only ends up being built with the new value
      if some other dependency has changed.
      
      To allow ninja, which does depend on the command line, to provide the
      same behavior, store the build number in out/build_number.txt, and
      use a shell expansion to cat the file in rules that use it.  This will
      cause the rule command to stay identical between builds, while still
      getting the new build number if the rule is rerun for a dependency.
      
      Also use the same trick for BUILD_FINGERPRINT, and the date in
      droiddoc rules.
      
      Change-Id: I6c5e6b6b3ef4c613563d7f5604df0e401575ba5f
      f37b4558
  27. 15 Jul, 2015 1 commit
  28. 10 Jul, 2015 2 commits
    • Tao Bao's avatar
      Pack file_contexts into target_files zip. · 2c15d9ee
      Tao Bao authored
      file_contexts (specified by SELINUX_FC) is needed both when building
      and (re)packaging. We used to use the copy in out/ when building, and
      looked for the copy in BOOT/RAMDISK/ when packaging from target_files
      zip. With system_root_image enabled, the file_contexts needed for
      building and packaging might be different from the one on device. So
      we explicitly pack the file as META/file_contexts in target_files zip.
      
      Also refactor out the overriding of selinux_fc property into
      common.LoadInfoDict().
      
      Change-Id: I94f9ea6671b3792c12c1c21573840743d63da39a
      (cherry picked from commit aa7318c3)
      2c15d9ee
    • Thierry Strudel's avatar
      fix device specific fs_config on build server · 74a81e66
      Thierry Strudel authored
      
      fs_config function from libcutils, in order to properly set the xattr FS
      used to define device specific uid, gid, permissions and capabilities,
      now needs TARGET_OUT make variable to be passed explicitly to all tools
      using it:
        fs_config
        fs_get_stats used by mktarball.sh
        make_ext4fs used by mkuserimg.sh
        mksquashfs used by mksquashfsimage.sh
      
      Bug: 21989305
      Bug: 22048934
      Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded
      Signed-off-by: default avatarThierry Strudel <tstrudel@google.com>
      74a81e66
  29. 07 Jul, 2015 1 commit
  30. 30 Jun, 2015 2 commits
    • Tao Bao's avatar
      Retry adjusting the size computation for reserved blocks. · 4e66343b
      Tao Bao authored
      Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
      few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
      OTA update failures. Adjust the size computation if the device has
      BOARD_HAS_EXT4_RESERVED_BLOCKS := true.
      
      It amends the last attemp in [1]. Now it computes the used blocks from the
      make_ext4fs output, instead of altering its argument.
      
      [1]: commit efbb5d2e.
      
      Bug: 21522719
      Bug: 22023465
      Bug: 22174684
      Change-Id: Iaae6507f6de68a5892f2e3035d330039287b4492
      (cherry picked from commit c7a6f1e4)
      4e66343b
    • Tao Bao's avatar
      Retry adjusting the size computation for reserved blocks. · c7a6f1e4
      Tao Bao authored
      Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
      few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
      OTA update failures. Adjust the size computation if the device has
      BOARD_HAS_EXT4_RESERVED_BLOCKS := true.
      
      It amends the last attemp in [1]. Now it computes the used blocks from the
      make_ext4fs output, instead of altering its argument.
      
      [1]: commit efbb5d2e.
      
      Bug: 21522719
      Bug: 22023465
      Bug: 22174684
      Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
      c7a6f1e4