Commit Graph

33884 Commits

Author SHA1 Message Date
Tianjie Xu 4ef67cee73 Merge "Do not read the block device when generating the care map"
am: d9880a0246

Change-Id: I466278a0f2a0158a4a5180be0b99d69e46585be9
2017-03-02 21:41:14 +00:00
Tianjie Xu d9880a0246 Merge "Do not read the block device when generating the care map" 2017-03-02 21:36:12 +00:00
Tao Bao 39809e3800 Merge "releasetools: Drop the support for fstab_version 1."
am: afc0ea14d8

Change-Id: I2c5b22de1cb549af2a64e5ae0cfaf238970b1af3
2017-03-02 19:22:03 +00:00
Treehugger Robot afc0ea14d8 Merge "releasetools: Drop the support for fstab_version 1." 2017-03-02 19:19:09 +00:00
Tianjie Xu 955629b4aa Do not read the block device when generating the care map
This remove the fstab dependency when building the OTA package for
marlin/sailfish.

Bug: 35811655
Test: OTA package builds successfully for sailfish.
Change-Id: If223d11dddca396c47262042c576f9e7d0cb5b33
(cherry picked from commit 7d051adc3b)
2017-03-02 11:07:12 -08:00
Richard Uhler bf0fea29e6 Merge "Don't include patch information for dex preopt."
am: 6f8e0d06e4

Change-Id: I99b47062c2c4db2c3f64e16a4188ff046fd5e7d4
2017-03-02 09:24:22 +00:00
Richard Uhler 6f8e0d06e4 Merge "Don't include patch information for dex preopt." 2017-03-02 09:18:48 +00:00
Steven Moreland 848e9430bc Merge "Add PRODUCT_FULL_TREBLE."
am: 5236e11c54

Change-Id: I40bf15624baf78113e3731476d46f2be0eb9cf61
2017-03-02 04:39:27 +00:00
Treehugger Robot 5236e11c54 Merge "Add PRODUCT_FULL_TREBLE." 2017-03-02 04:31:39 +00:00
Yifan Hong 28070816fb Merge "sintf.xml => manifest.xml"
am: aeec3bfde7

Change-Id: Ice2fd7685dc57f05b3911d5b74a922d2731c8669
2017-03-02 03:46:30 +00:00
Treehugger Robot aeec3bfde7 Merge "sintf.xml => manifest.xml" 2017-03-02 03:41:21 +00:00
Steven Moreland c10f1413d5 Add PRODUCT_FULL_TREBLE.
PRODUCT_FULL_TREBLE: whether the device has Treble fully enabled (no
passthrough hals, vendor.img, split sepolicy, etc..)

PRODUCT_FULL_TREBLE_OVERRIDE: used if someone wants to consider a device
as full Treble even if it didn't launch with Android O.

Bug: 35809750
Test: PRODUCT_FULL_TREBLE set appropriately with
PRODUCT_FULL_TREBLE_OVERRIDE and PRODUCT_SHIPPING_API_LEVEL = 24/25

Change-Id: I069448beaf26c70acb6c45d4228d8fdfe9476410
2017-03-01 19:08:24 -08:00
Yifan Hong c3373a32e4 sintf.xml => manifest.xml
Bug: 35870239
Test: make -j64 and ensure manifest.xml is there.
Change-Id: I5eccc6dcdc04a3caadc3ccce1d8b58c12f5950ee
2017-03-01 18:09:28 -08:00
Tao Bao d1de6f326e releasetools: Drop the support for fstab_version 1.
fstab_version is defined by RECOVERY_FSTAB_VERSION in
bootable/recovery. We have moved to fstab_version 2 since commit
f35d1cef7c19db975a1295e8c23c7fb8bd2489f9 (landed into JB MR2).

Drop the support for fstab_version 1, since we won't run the latest OTA
script over a JB target_files zip.

Test: No impact on building full/incremental OTAs.
Change-Id: Ia87c4e7da6c5e71ce0908fca2e4f1ad1c06ba869
2017-03-01 16:56:45 -08:00
Tao Bao 19e700aaf9 Merge "releasetools: Add support for --override_timestamp."
am: e889893776

Change-Id: I038d81bec31cffb4aba7072e1ffbad2b04c2299a
2017-03-02 00:11:40 +00:00
Tao Bao e889893776 Merge "releasetools: Add support for --override_timestamp." 2017-03-02 00:00:59 +00:00
Josh Gao d3e865abbe Merge "Fix stacks on 64 bit processes."
am: aea79fa207

Change-Id: I67828f33969225c3c61c50f533b2a2a77f9bb78c
2017-03-01 21:16:54 +00:00
Treehugger Robot aea79fa207 Merge "Fix stacks on 64 bit processes." 2017-03-01 21:05:34 +00:00
Josh Gao 310b6ff676 Fix stacks on 64 bit processes.
debuggerd64 doesn't exist anymore, `debuggerd $PID` works on both 32
and 64 bit processes.

Bug: http://b/35872661
Change-Id: I47be05c7ec346e5d657d06e6c3aff1723494639b
2017-03-01 11:34:58 -08:00
Philip P. Moltmann d73c40d73c Merge "Ship BuiltInPrintService in default repo"
am: 779ba5e692

Change-Id: Iee8e4c9a0b7ebd555c94865e8781fbd1a996e56c
2017-03-01 19:30:52 +00:00
Philip P. Moltmann 779ba5e692 Merge "Ship BuiltInPrintService in default repo" 2017-03-01 19:21:48 +00:00
Tao Bao 514e6e4488 Merge "releasetools: Merge two identical conditional branches."
am: 59978ab6e3

Change-Id: I7a5c85ebff5e3ee4ecf3209b3a016daa1ddb14a9
2017-03-01 18:03:46 +00:00
Treehugger Robot 59978ab6e3 Merge "releasetools: Merge two identical conditional branches." 2017-03-01 17:58:12 +00:00
Tao Bao 9beea2a4a3 releasetools: Merge two identical conditional branches.
The merged two branches have become identical since commit
fc3422ad36 (landed into Nougat).

Test: Get identical incremental packages w/ and w/o the CL.
Change-Id: Id1183f8ed83f684a0dac1a4af87b6e075b08aabc
2017-02-28 20:20:27 -08:00
Ryan Campbell 425bbada28 Merge "Use c and cpp objects for gcov."
am: d579b8eb1f

Change-Id: I6490b5b6c443952ac672847df8748df31e5933ff
2017-03-01 03:10:24 +00:00
Ryan Campbell d579b8eb1f Merge "Use c and cpp objects for gcov." 2017-03-01 03:05:56 +00:00
Yifan Hong 40517f3ea3 Merge "Add system/manifest.xml on device"
am: 569cb34dc0

Change-Id: Id838f4f9f25694c6347c35ca6470ff781fa7db42
2017-03-01 02:57:58 +00:00
Treehugger Robot 569cb34dc0 Merge "Add system/manifest.xml on device" 2017-03-01 02:54:52 +00:00
Ryan Campbell 5a6ea36cb8 Use c and cpp objects for gcov.
Instead of using all_objects and translating .o to .gcno, use
cpp_objects, gen_cpp_objects, c_objects, gen_c_objects, objc_objects,
and objcpp_objects. Fixes bug with .s files breaking coverage builds.

Bug: 35843991
Test: lunch sailfish-userdebug && make -j60 NATIVE_COVERAGE=true
COVERAGE_PATHS="vendor/google_devices/marlin/proprietary/mm-camera/mm-camera2"
Change-Id: Ib2f8eef889f075ec82f79d8c3ae0fe31962b653d
2017-02-28 16:29:06 -08:00
Yifan Hong 7ebc342b86 Add system/manifest.xml on device
Similar to vendor/manifest.xml on device, this file lists
all HALs defined in the framework (and hence go
to the system image). IServiceManager / IMemory /
etc. getService should consult this file (via VINTF
object under /system/libvintf) to return the HAL in the correct
transport mode.

Bug: 34772739 Create system/manifest.xml
Bug: 35219444 Need interface + instance entry

Test: compiles and manually confirm that system/manifest.xml exist.
Change-Id: I5b3c79b068841e47062cbab6f72d70555801a21d
2017-02-28 16:13:42 -08:00
Simran Basi 22cc401165 Merge "Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories."
am: 6abedc9b3e

Change-Id: Ic01ee13e25df68d8cf850fa81b445150f16f1136
2017-02-28 23:46:09 +00:00
Treehugger Robot 6abedc9b3e Merge "Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories." 2017-02-28 23:42:18 +00:00
Dan Willemsen d1378dec05 Merge changes I5e684409,I4fa35540,I24015ef0
am: 93de77745c

Change-Id: I2ac9d2922435058bcd900f902c308736f6710bed
2017-02-28 21:37:03 +00:00
Dan Willemsen 93de77745c Merge changes I5e684409,I4fa35540,I24015ef0
* changes:
  Improve module tags warnings
  Improve warnings for package-modules.mk
  Fix all_named_products, remove kati_all_products
2017-02-28 21:30:55 +00:00
Tao Bao 3e6161a3b3 releasetools: Add support for --override_timestamp.
We use the timestamps in builds to determine a downgrade, which might
not be always the truth. For examples, two builds cut from different
branches may carry timestamps in a reverse order. An incremental package
won't be able to be pushed nor applied, based on the timestamp
comparison.

We used to handle such a case with manual work, by setting the
post-timestamp to (pre-timestamp + 1) in the package metadata. This CL
automates the process by adding a new flag --override_timestamp.

Note that it doesn't change anything in the installed image, but only
affects the assertions for pushing / installing the package.

With the change in this CL:
 - If it's a downgrade without any extra flag, fail the package
   generation (we only print warnings prior to this CL);
 - If it's a downgrade with --downgrade flag, generate a downgrade
   package with forced data wipe (same as before);
 - If it's a downgrade with --override_timestamp, generate a normal
   incremental with hacked timestamp (pre-timestamp + 1) (new in this CL
   to avoid the manual change);
 - If it's not a downgrade but with any of the above two flags specified,
   fail the package generation.

Bug: 33744169
Test: Generate an incremental from builds with reversed timestamps.
Change-Id: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
2017-02-28 13:01:13 -08:00
Dan Willemsen d9b773845d Merge "Turn USE_SOONG_UI on by default"
am: 39a6418d76

Change-Id: If4a59c9d051f4d3dd4152f5f30da50bf5feeceaf
2017-02-28 20:42:27 +00:00
Simran Basi 6bea37c7fa Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories.
1) Updates the LOCAL_COMPATIBILITY_SUITE line to allow for a
   testcase to belong to multiple suites.
2) Building testcases no longer fails if
   COMPATIBILITY_TESTCASES_OUT_<suite> is not defined. This
   testcase will just not output to that directory.
   This will be utilized by the device-tests and general-tests
   suites that don't require any extra output besides the common
   testcase directory.

Bug: 35394351
Test: 1) Added multiple *TS testcases to cts & vts and verified they
       ended up in the common directory and each suite's testcase
       directory. Specifically tested CtsSplitApp to ensure the
       split usecase still works as well.
      2) Added a CTS testcase to the device-tests suite, built
       device-tests and verified the cts/android-cts/testcases
       copy was not produced.

Change-Id: Ic4c4e87e62be4fc0c5e394d88cc359518346dffa
2017-02-28 12:41:40 -08:00
Dan Willemsen 39a6418d76 Merge "Turn USE_SOONG_UI on by default" 2017-02-28 20:35:09 +00:00
Elliott Hughes daac92eb51 Merge "There's no longer a limit on property names."
am: dda91dbef8

Change-Id: Ia3e5851c5033b35d28ad1405b863c8305ccd8cf8
2017-02-28 20:18:27 +00:00
Treehugger Robot dda91dbef8 Merge "There's no longer a limit on property names." 2017-02-28 20:13:14 +00:00
Dan Willemsen 73da612ed0 Turn USE_SOONG_UI on by default
Set USE_SOONG_UI=false to disable the new soong_ui wrapper.

Test: m -j blueprint_tools
Test: USE_SOONG_UI=false m -j blueprint_tools
Change-Id: I0b217939a29fd51e69ef594f824b14e25a4c8c4d
2017-02-28 18:57:12 +00:00
Tao Bao ba765d7c47 Merge "Remove the backwards compatibility support for misc_info.txt."
am: 042d5a846f

Change-Id: I1696d4661caa9b5b14121da0f1e0e1bedf6b31bf
2017-02-28 18:10:18 +00:00
Treehugger Robot 042d5a846f Merge "Remove the backwards compatibility support for misc_info.txt." 2017-02-28 18:05:16 +00:00
Elliott Hughes 05c1a2a55c There's no longer a limit on property names.
Bug: http://b/33926793
Test: boots
Change-Id: I12cdae782090fb0856171e5c90a268e91ba2ae1a
2017-02-28 10:04:23 -08:00
Richard Uhler 41408b0e1a Don't include patch information for dex preopt.
Because we always compile pic, patch information is not needed.

Test: phone boots.
Bug: 33192586
Change-Id: I46a6db713e0ce21300e3f4b86bd771a68eeed0c4
2017-02-28 17:05:12 +00:00
Ryan Campbell 26a4ce0b65 Merge "Support path exclusion for native coverage."
am: e317a2d19e

Change-Id: I1b0f1d4bc0664ba5bd0f24dee8e0778d18a82504
2017-02-28 02:11:25 +00:00
Treehugger Robot e317a2d19e Merge "Support path exclusion for native coverage." 2017-02-28 02:06:57 +00:00
Tao Bao 6cd54739a4 Remove the backwards compatibility support for misc_info.txt.
We introduced META/misc_info.txt to hold the misc info since Gingerbread
(commit 37974731fc). Remove the backwards
compatibility support for building pre-G TF zips.

Test: `m dist` works.
Change-Id: Ibff7aaf69cc7e460634c049d11a004f7196f8f73
2017-02-27 17:00:13 -08:00
Alex Klyubin 22bcc5db9d Merge "Make secilc available"
am: bbdd0e8745

Change-Id: I6ce67f392ab6523f2ac96e4f32e37a93e9272095
2017-02-27 23:23:57 +00:00
Treehugger Robot bbdd0e8745 Merge "Make secilc available" 2017-02-27 23:20:59 +00:00