Commit Graph

33911 Commits

Author SHA1 Message Date
Alex Deymo 4afbddcdf7 Merge "Update product_id and product_version location."
am: a57a2fd118

Change-Id: Ie1b80f0eb8e7a2041a9c693187d95cb331cf0940
2017-03-04 01:51:25 +00:00
Alex Deymo c4ca4c41f8 Merge "Add PRODUCT_IOT to the list of product vars."
am: e90295014f

Change-Id: I1f41687a0e747765baa07931035b360977683837
2017-03-04 01:51:00 +00:00
Alex Deymo a57a2fd118 Merge "Update product_id and product_version location." 2017-03-04 01:46:21 +00:00
Alex Deymo e90295014f Merge "Add PRODUCT_IOT to the list of product vars." 2017-03-04 01:46:06 +00:00
Mathieu Chartier ab70e664c3 Merge "Avoid copying profile"
am: c2159fd5b6

Change-Id: Ida40968af33c5559986336c328067f1bfdfacdde
2017-03-03 22:42:15 +00:00
Mathieu Chartier c2159fd5b6 Merge "Avoid copying profile" 2017-03-03 22:36:46 +00:00
Sen Jiang efcda5173d Merge "Remove DBus support."
am: cf858d873b

Change-Id: I09cbc25da9f801128b21bbda691f18f465fb2c9c
2017-03-03 20:57:36 +00:00
Sen Jiang cf858d873b Merge "Remove DBus support." 2017-03-03 20:54:38 +00:00
Mathieu Chartier 62e1ed7a63 Avoid copying profile
We can just use the source profile.

Bug: 34929159
Test: m

Change-Id: Ibbc0b392052f2a7f76bada13493ca62dc0334ace
2017-03-03 12:47:30 -08:00
Mathieu Chartier 1bf2231a4a Merge "Use ANDROID_LOG_TAGS to filter spammy profman output"
am: 4fdf2189b0

Change-Id: I278362252ae7d8b5d70795e7394d3730a61a1fc1
2017-03-03 17:50:25 +00:00
Mathieu Chartier 4fdf2189b0 Merge "Use ANDROID_LOG_TAGS to filter spammy profman output" 2017-03-03 17:47:08 +00:00
Alex Deymo b4309d4f54 Update product_id and product_version location.
These files are used by the update console to determine the product
associated with a given target_files.zip.

Bug: 35804180
Bug: 33211225
Test: `make dist` generates a target_files.zip with these files.
Change-Id: I6066da07d76749ae64c26d5f661c7a6d06f3fb3d
2017-03-03 17:32:42 +00:00
Alex Deymo 8fe63c3899 Add PRODUCT_IOT to the list of product vars.
This variable tells whether the product is an Android Things variant of
Android.

Bug: 32549448
Test: `make dist` on an iot product.
Change-Id: I0875951ae57867bc8bf47885e77e494d6284acdb
2017-03-02 22:08:41 -08:00
Vijay Venkatraman e4f88be6ed Merge "Fix for compile error when BUILD_HEADER_LIBRARY is used"
am: 69e8252aec

Change-Id: Icddb2f285d9f08a6fce89dcac69cf38259d9edf6
2017-03-03 04:15:40 +00:00
Vijay Venkatraman 69e8252aec Merge "Fix for compile error when BUILD_HEADER_LIBRARY is used" 2017-03-03 04:10:50 +00:00
Alex Klyubin 8fe478de64 Merge "Include secilc and sepolicy conditionally, elsewhere"
am: 3e78704825

Change-Id: I00b1084eca64b0c42ea4f814f75a9e1f53a87879
2017-03-03 03:55:46 +00:00
Treehugger Robot 3e78704825 Merge "Include secilc and sepolicy conditionally, elsewhere" 2017-03-03 03:50:48 +00:00
Sen Jiang d1f397e8b4 Remove DBus support.
external/dbus and external/dbus-binding-generator was removed from
the manifest.

Bug: 31602715
Test: make checkbuild
Change-Id: Iea0277720acad8ac0fa630b8745f90fb3c3b5f00
2017-03-02 18:00:21 -08:00
Mathieu Chartier c185f742e1 Merge "Add local preopt options for generating app image and profile"
am: fea31c0b9e

Change-Id: I58a6232ff9b001669b6b0f2c88e42b282e2e0ddc
2017-03-03 01:18:16 +00:00
Mathieu Chartier fea31c0b9e Merge "Add local preopt options for generating app image and profile" 2017-03-03 01:14:03 +00:00
Mathieu Chartier 1e91c9db07 Use ANDROID_LOG_TAGS to filter spammy profman output
Test: mm

Bug: 34929159

Change-Id: I794c4a063ab3b4e515ecc20b58a6f985e093fa21
2017-03-02 17:03:06 -08:00
Calin Juravle a5ab384e1c Merge "Enable secondary dex compilation in the background dexopt job"
am: 34200a1ad1

Change-Id: I6414d7e0a2a2bc783e85094f9cb11fe0290ac0e4
2017-03-02 23:58:24 +00:00
Calin Juravle 34200a1ad1 Merge "Enable secondary dex compilation in the background dexopt job" 2017-03-02 23:54:24 +00:00
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 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 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