Commit Graph

34091 Commits

Author SHA1 Message Date
Mathieu Chartier a4b993b5b9 Add local preopt options for generating app image and profile
If true, LOCAL_DEX_PREOPT_APP_IMAGE cause dex2oat to generate an app
image.

If true, LOCAL_DEX_PREOPT_GENERATE_PROFILE generates a profile based
on a class listing. LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING must be
defined in this case.

Bug: 34929159

Test: device booting, image loaded

(cherry picked from commit 9968fdcd85)

Change-Id: Ib79ada86a4ac617491723f80d99a3add3d52a7f4
2017-03-02 15:17:04 -08:00
Tianjie Xu 49ba2bbe7e Merge "Do not read the block device when generating the care map" am: d9880a0246
am: 4ef67cee73

Change-Id: I8b4967fb9dee355599e6deb611c4b219b669040c
2017-03-02 21:43:14 +00:00
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
Calin Juravle 148d23106b Enable secondary dex compilation in the background dexopt job
Test: adb shell cmd package bg-dexopt-job
Bug: 32871170

(cherry picked from commit dc308c1b1d)

Change-Id: I21664d5e11dada868dab502498b7c5e598852289

Merged-In: I473e291a26335bd766c8845d2ea28c4f1e45db53
2017-03-02 13:04:17 -08:00
Alex Klyubin 8e87853a04 Include secilc and sepolicy conditionally, elsewhere
This removes the unconditional inclusion of secilc and sepolicy.
These artefacts are now conditionally included by system/core/init.
The reason for declaring the conditional inclusion there is because
the desired conditional inclusion based on PRODUCT_FULL_TREBLE cannot
be declared here because PRODUCT_FULL_TREBLE is not yet available when
this file is interpreted.

Test: Device boots, no additional SELinux denials. This test is
      performed on a device with PRODUCT_FULL_TREBLE set to true, and
      on a device with PRODUCT_FULL_TREBLE set to false.
Test: Device with PRODUCT_FULL_TREBLE set to true contains secilc and
      the three *.cil files, but does not contain the sepolicy file.
      Device with PRODUCT_FULL_TREBLE set to false contains sepolicy
      file but does not contain the secilc file or any *.cil files.
Bug: 31363362

Change-Id: Ia3f38948b71a054918f5f63c594ba62a033e1066
2017-03-02 12:58:38 -08:00
Vijay Venkatraman 465b17fc3c Fix for compile error when BUILD_HEADER_LIBRARY is used
Test: include $(BUILD_HEADER_LIBRARY) in Android.mk and compile
Change-Id: If720be2d73b1c026961c75b65d82887b5dd41442
2017-03-02 11:47:33 -08:00
Tao Bao 126d7b178d Merge "releasetools: Drop the support for fstab_version 1." am: afc0ea14d8
am: 39809e3800

Change-Id: Ib63f95327d204d692737a544bf2b401dedea504c
2017-03-02 19:24:35 +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 24c6516e1d Merge "Don't include patch information for dex preopt." am: 6f8e0d06e4
am: bf0fea29e6

Change-Id: I1f9c79b869f4a270e7ce3524f4bbb115fdef2f90
2017-03-02 09:26:23 +00: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 e1de7cd45a Merge "Add PRODUCT_FULL_TREBLE." am: 5236e11c54
am: 848e9430bc

Change-Id: Icb27d3a034695ea4367286cf288e460e2feec76e
2017-03-02 04:44:58 +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 1b510a9705 Merge "sintf.xml => manifest.xml" am: aeec3bfde7
am: 28070816fb

Change-Id: I88cd44f564ecbd3a96dec9e8a4021871295bd636
2017-03-02 03:51:25 +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 44a544bc59 Merge "releasetools: Add support for --override_timestamp." am: e889893776
am: 19e700aaf9

Change-Id: Ibbc7c72c5c4718a46b244a392f5d047c4c59797c
2017-03-02 00:16:11 +00: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 a941b547c0 Merge "Fix stacks on 64 bit processes." am: aea79fa207
am: d3e865abbe

Change-Id: I8b213db27f67f7ed9ca9edd08990226fd860078a
2017-03-01 21:19:22 +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 7d91f81dfb Merge "Ship BuiltInPrintService in default repo" am: 779ba5e692
am: d73c40d73c

Change-Id: If3287144fe5ba43ce611a0c6f291b77346ad76e4
2017-03-01 19:33:22 +00: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 81d1ad1267 Merge "releasetools: Merge two identical conditional branches." am: 59978ab6e3
am: 514e6e4488

Change-Id: I8f95b75becdb503c1837c1bc215f88f019eaa356
2017-03-01 18:05:46 +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 74ec2776e8 Merge "Use c and cpp objects for gcov." am: d579b8eb1f
am: 425bbada28

Change-Id: Ia86f4824c74c550b4e9f3fca63241dd63b179a7d
2017-03-01 03:12:22 +00: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 65460a8fb9 Merge "Add system/manifest.xml on device" am: 569cb34dc0
am: 40517f3ea3

Change-Id: I82889a7327c9e7bedec18b4ba38826e8227815df
2017-03-01 02:59:54 +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 7fa662af82 Merge "Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories." am: 6abedc9b3e
am: 22cc401165

Change-Id: Ie62e372c19e2b187079c9830ba4936aaa14bec29
2017-02-28 23:48:10 +00: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 ead8af8580 Merge changes I5e684409,I4fa35540,I24015ef0 am: 93de77745c
am: d1378dec05

Change-Id: Ib7984c3abaed6c2ad5e63beee45bc263d076750c
2017-02-28 21:39:01 +00:00
Dan Willemsen d1378dec05 Merge changes I5e684409,I4fa35540,I24015ef0
am: 93de77745c

Change-Id: I2ac9d2922435058bcd900f902c308736f6710bed
2017-02-28 21:37:03 +00:00