Commit Graph

11490 Commits

Author SHA1 Message Date
Tao Bao f2305870f0 Makefile: Pack e2fsdroid into otatools.zip. am: bcc3109262
am: 8c07d3c840

Change-Id: I618f192b092feef99f430b65a4463c925e382d1b
2017-01-09 19:32:30 +00:00
Tao Bao bcc3109262 Makefile: Pack e2fsdroid into otatools.zip.
e2fsdroid is needed to create ext4 images with mke2fs. Also pack both
sets of mke2fs and make_ext4fs tools into otatools.zip. Because we use
the latest otatools.zip to create OTAs, which needs to handle
target_files.zip using either of them.

Bug: 34126605
Test: `m otatools-package` and check it has e2fsdroid and make_ext4fs.
Test: Use otatools.zip to sign a TF.zip that defines
      TARGET_USES_MKE2FS={true,false}.

Change-Id: I9967e4f078cbe912914c6c511681cba82356ae8e
2017-01-06 14:32:51 -08:00
Dan Willemsen cb43c0f8db Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am: 81648927fb
am: ce324c6848

Change-Id: I1260ea1bba7de40cb0f9a3661f281406f48cd708
2017-01-05 22:51:44 +00:00
Dan Willemsen 81648927fb Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" 2017-01-05 22:42:07 +00:00
Dan Willemsen 00cf76767f TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates
Also mark these variables as readonly so that later Android.mk cannot
change them.

Bug: 33607778
Test: build/tools/kati_all_products.sh -j12
Change-Id: I5f9a4df02bfdfd56549728f074bbb3fc251edb3d
2017-01-04 17:36:30 -08:00
Keun Soo Yim f1125508ba delete vts.mk (which is moved to test/vts) am: 18a316c161
am: ed61c29cfd

Change-Id: If7f214225e07c3b5789d2d79b808c432c92fee27
2017-01-04 23:08:31 +00:00
Keun Soo Yim 03616abb42 include VTS packaging task files am: b74649d027
am: 33f6d707fa

Change-Id: Ia84408c4ea3215acefd3f666525df397d868fc52
2017-01-04 23:08:25 +00:00
Keun Soo Yim 18a316c161 delete vts.mk (which is moved to test/vts)
Test: m -j vts
Change-Id: I3ab29e59b6f77f3ac92bbfe7a6f7a8f36b2ba3bd
(cherry picked from commit a942dc8433)
2017-01-04 13:16:33 -08:00
Keun Soo Yim b74649d027 include VTS packaging task files
Test: m -j vts
Change-Id: I8737412bf4e7b5c2db32325105e7c588949b959d
(cherry picked from commit 199a710f73)
2017-01-04 13:16:33 -08:00
Hung-ying Tyan 150db0ea6f Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am: 1a4a0a4539
am: 82e3d0d007

Change-Id: I65daac2e70657ae651a705d3768555ab1b727d05
2017-01-04 02:48:19 +00:00
Treehugger Robot 1a4a0a4539 Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" 2017-01-04 02:44:04 +00:00
Richard Uhler 8a02582f70 Merge "Remove option for non-pic dex preopt." am: c184ef515c
am: ffb29d7497

Change-Id: I15c5c9f03f33a02a7f39e781e5e945fe5c74f4bd
2017-01-03 09:52:16 +00:00
Treehugger Robot c184ef515c Merge "Remove option for non-pic dex preopt." 2017-01-03 09:39:39 +00:00
Treehugger Robot cafc7efee0 Merge "Update pathmap.mk for renderscript support library migration" 2016-12-23 03:02:55 +00:00
Alan Viverette cdeb44df2f Update pathmap.mk for renderscript support library migration
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c8)
2016-12-22 17:32:20 -08:00
Colin Cross 5b0573233f Merge "Update pathmap.mk for renderscript support library migration" into nyc-mr1-dev-plus-aosp 2016-12-23 00:54:33 +00:00
Dan Willemsen bbf841d45f Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" am: fb2efba189
am: 952d5adcde

Change-Id: I57b99cf8d157dbcf8f10e8d1d4b56a8529d1354f
2016-12-22 23:39:47 +00:00
Dan Willemsen fb2efba189 Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" 2016-12-22 23:27:38 +00:00
Alan Viverette 74b13397d9 Update pathmap.mk for renderscript support library migration
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c8)
2016-12-22 23:27:18 +00:00
Dan Willemsen 584e4724ba Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags
We really should be re-running Kati when a file in here changes, since
it may actually affect the result. The general problem we've run into is
when there are two kati output files that are clean according to the
current rules, but if they actually ran we'd force an installclean.

This also had the side-effect of not running shell commands that touched
$OUT_DIR, like writing files using $(shell echo ... >out/...), now those
may be run.

This will cause Kati to re-read the makefiles more often -- twice when a
CleanSpec.mk changes, twice when switching products on the same device.
Basically every time we read the old state, do something about it, and
write out the new state, we need to rerun the next time so we aren't
continuously cleaning up what changed.

Bug: 30947985
Test: Manual, switching between configurations; enable --regen_debug
Change-Id: I888f9f8295f318f8214b2c79525cf94f457a5a8b
2016-12-22 22:19:19 +00:00
Dan Willemsen 4ad881c067 Merge "Support non-gtest NATIVE_TESTS" am: 561b0a3753
am: 1ef5112475

Change-Id: I7c16881f0efb637bf13a0af1e4c89640d7e218e6
2016-12-22 20:42:06 +00:00
Dan Willemsen 561b0a3753 Merge "Support non-gtest NATIVE_TESTS" 2016-12-22 20:29:41 +00:00
Dan Willemsen 5ae5671a3b Merge "Remove generated java source post clean logic" am: f57aa792c3
am: 5208e4f473

Change-Id: I18c9cf7fa19346e08d25d9fcba3b5538a7bf1127
2016-12-22 20:24:35 +00:00
Dan Willemsen cf324af6b8 Remove generated java source post clean logic
Just move the proto and renderscript sources into their own directories
-- the entire directory is wiped if the file list changes since the
command line will change. So we can just enable/disable pulling sources
from those directories based on whether there were files in the list or
not.

Bug: 30947985
Test: m -j java
Test: Remove a proto file from a java lib, ensure the generated source
      is not included.
Change-Id: If7529979de6fa62a651933a3a974f47b033851d6
2016-12-22 10:37:31 -08:00
Vijay Venkatraman 64a1b146af Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" am: 43a7f0c765
am: b3ada4048f

Change-Id: Iebc8f31f1d8bd5fab5557a706f8d2d25d97e507a
2016-12-22 06:08:46 +00:00
Vijay Venkatraman 43a7f0c765 Revert "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""
This reverts commit 823172e209.

Test: build.ninja for any target doesnt change, unless
BOARD_VNDK_VERSION is turned on in BoardConfig.mk
Change-Id: I4e1baaf5a2251de20f71a47096ce53e23d7e2d80
2016-12-22 05:53:39 +00:00
Dan Willemsen 9416c20b79 Support non-gtest NATIVE_TESTS
We've had this in Soong for a while, but never supported it in Make.

Bug: 33819328
Test: Change LOCAL_GTEST on a module, check m -j ... showcommands
Change-Id: Id8f4b9908c82c05d9a986a38945b33bac578e991
2016-12-21 20:27:06 -08:00
Tao Bao f2cffd6849 Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file" am: 376c0146b3
am: 7def52bfe8

Change-Id: I4473d91d021fc17bd3412bae0967a68dc7283aff
2016-12-21 06:22:52 +00:00
Tao Bao 376c0146b3 Merge "HOST_OUT_EXECUTABLES path is not needed in misc_info file" 2016-12-21 06:08:23 +00:00
Tao Bao b6f7b14c0e Merge "otatools: added missing shared library for make_ext4fs" am: 0ced0a1f50
am: 372a877659

Change-Id: I5cc501bd8f78cb4b1611bbc7e0e3b0a58bfd91f4
2016-12-21 04:41:17 +00:00
Tao Bao 0ced0a1f50 Merge "otatools: added missing shared library for make_ext4fs" 2016-12-21 04:30:26 +00:00
Hiroshi Yamauchi 9876e6483b Merge "Add ART_USE_READ_BARRIER to product variables." am: e34819ccce
am: f9e277e1fe

Change-Id: I4a0addd85f0e1dcc98250a60084f88be118276cc
2016-12-20 20:40:10 +00:00
Vikram Dattu 29e88b850e HOST_OUT_EXECUTABLES path is not needed in misc_info file
HOST_OUT_EXECUTABLES is already added to the PATH variable,
so it is not needed to add the path info for binaries in
misc_info.txt and <partition>_image_info.txt.

Earlier the mkuserimg item in the build_image dictionary is
hardcoded to "mkuserimg.sh", but now it is customized for
mkuserimg.sh and mkuserimg_mke2fs.sh, and maintained in
dictionary "ext_mkuserimg=$(MKEXTUSERIMG)" in misc_info.txt
and <partition>_image_info.txt, where it is used in the
build_image script while creating the images.

The problem here is the value for this key is set to build
path of the file mkuserimg file
$(HOST_OUT_EXECUTABLES)/mkuserimg.sh,
i.e. out/host/linux_x86/bin/mkuserimg.sh,
there by standalone signing the images using otatools is
not working as the executables are packed in bin folder.

Test: tools/releasetools/sign_target_files_apks
    -p <extracted ota-tools.zip folder>
    --extra_signapk_args=-f /etc/opt/cert_data.dat
    -v
    --replace_verity_private_key ~/build/target/product/security/verity
    --replace_verity_public_key ~/build/target/product/security/verity.x509.pem
    -k <key maping>
    <input target files zip>
    <output target files zip>

Change-Id: I57af1025ec38f3794f779c49faa0bf965afc6a5d
2016-12-20 13:55:06 +01:00
Vikram Dattu 8be44674a1 otatools: added missing shared library for make_ext4fs
Added the missing shared library libpcre2.so for make_ext4fs
in the otatools.zip.
Standalone signing the images with otatools zip is not working
due to missing library for make_ext4fs.

Test: tools/releasetools/sign_target_files_apks
    -p <extracted ota-tools.zip folder>
    --extra_signapk_args=-f /etc/opt/cert_data.dat
    -v
    --replace_verity_private_key ~/build/target/product/security/verity
    --replace_verity_public_key ~/build/target/product/security/verity.x509.pem
    -k <key maping>
    <input target files zip>
    <output target files zip>

Change-Id: I4fc71a1c710f3075bb3bdb90d915538526004ee6
2016-12-20 13:53:34 +01:00
Hiroshi Yamauchi 64594c4f53 Add ART_USE_READ_BARRIER to product variables.
Bug: 33492005
Test: top-level build for angler.
Change-Id: I12aa2e18487c16423223f110b6dfb0d6dff1e7e8
2016-12-19 16:25:00 -08:00
Richard Uhler c30981e2d0 Remove option for non-pic dex preopt.
Test: make checkbuild, aosp_bullhead-userdebug boots.
Bug: 33192586

Change-Id: I4dd179fac33d777fb10cc85a99ff68c3b0d0e03d
2016-12-19 09:52:25 +00:00
Daniel Cashman 6549a83888 Merge "Revert "Add build dependencies for split sepolicy files."" am: cbdc0bd096
am: 5e8be7b822

Change-Id: I6b1e6db6a505f8a65879228dc8fa9b1863724ca1
2016-12-17 01:16:42 +00:00
Daniel Cashman df1e2102c6 Revert "Add build dependencies for split sepolicy files."
This reverts commit 086189145c.

Change-Id: Idfd210d1f16eefcedda6154b0361611f53c5158f
2016-12-17 00:53:52 +00:00
dcashman ced437a479 Merge "Add build dependencies for split sepolicy files." am: 298f9b5925
am: bc1832f381

Change-Id: Ic0a40500003afdd54e1a68cfec2937ae0f2aee06
2016-12-17 00:32:40 +00:00
dcashman 086189145c Add build dependencies for split sepolicy files.
Add build targets for split sepolicy files so they'll appear in the root dir for
on-device compilation.  nonplat_sepolicy will eventually be removed as it should
be provided by a different partition.  Also replace sepolicy.recovery with the
appropriate split components.

Bug: 31363362
Test: Policy builds on-device and boots.
Change-Id: I017dabe6940c3cd20de6c00bb5253274d5a9269b
2016-12-16 14:01:29 -08:00
Alex Klyubin bf78cdd81e Merge "aapt no longer needed for signing APKs" am: 3cfff7386f
am: 2c70770e93

Change-Id: I920311adea1085830df6ed992711e26aed38c2a1
2016-12-16 17:38:53 +00:00
Alex Klyubin 176a27a7a2 Merge "Remove unused get-package-min-sdk-version-int" am: 5a1ba84c30
am: 24b383a770

Change-Id: Iafe2ea0495e9c1b5c77eb4d995101c60e85700af
2016-12-16 17:38:40 +00:00
Alex Klyubin 3cfff7386f Merge "aapt no longer needed for signing APKs" 2016-12-16 17:21:13 +00:00
Alex Klyubin 5a1ba84c30 Merge "Remove unused get-package-min-sdk-version-int" 2016-12-16 17:20:23 +00:00
Vijay Venkatraman f880ab9021 Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set." am: 823172e209
am: e9709b4575

Change-Id: I8166568b64cbda20c35fb4b07ea24ce6578158fc
2016-12-16 02:26:19 +00:00
Vijay Venkatraman e9709b4575 Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."
am: 823172e209

Change-Id: If6249d3b311089ea342fb873288ad38c12bc53d1
2016-12-16 02:17:47 +00:00
Vijay Venkatraman e4be608d2f Merge "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" 2016-12-16 02:11:12 +00:00
Vijay Venkatraman 823172e209 Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."
This reverts commit 2b6c204c73.

Change-Id: I60a042f2ed0c767ec3a45c31ee1b99d43891efaa
2016-12-16 02:08:18 +00:00
Alex Klyubin 664cc31fd8 Remove unused get-package-min-sdk-version-int
The only user of get-package-min-sdk-version-int was signapk. signapk
no longer needs to be provided with the APK's minSdkVersion though.

(cherry picked from commit e185da21ca)
Test: make clean && make

Change-Id: I6867a004aec0f3752cbbc99cc30e02ca5404b3c4
2016-12-15 16:37:37 -08:00
Alex Klyubin 1b391c002d aapt no longer needed for signing APKs
signapk now auto-detects the APK's minSdkVersion, removing the need to
run aapt dump badging during APK signing.

Test: make clean && make
Change-Id: Ifc74292a9900443d053e437b50b540c8d0b33dbd
2016-12-15 16:37:21 -08:00