Alex Deymo
5393f580b6
Merge "Update product_id and product_version location." am: a57a2fd118
...
am: 4afbddcdf7
Change-Id: I9e9ce4046d7641df3e84d948ce9bc638f45bf8d8
2017-03-04 01:53:58 +00:00
Alex Deymo
24428c0dac
Merge "Add PRODUCT_IOT to the list of product vars." am: e90295014f
...
am: c4ca4c41f8
Change-Id: I2f4abbdd47baa21f1e3f55c6a61e6f1b32aaeb3e
2017-03-04 01:53:29 +00:00
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
d9b318e6b5
Merge "Avoid copying profile" am: c2159fd5b6
...
am: ab70e664c3
Change-Id: I117b8f0448bbcca8537378ec024540d37376dd31
2017-03-03 22:45:15 +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
3d6b408aea
Merge "Remove DBus support." am: cf858d873b
...
am: efcda5173d
Change-Id: I17fc5e8650268528763ee7aa58a5dcdd23826dad
2017-03-03 21:00:07 +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
2a61eb6075
Merge "Use ANDROID_LOG_TAGS to filter spammy profman output" am: 4fdf2189b0
...
am: 1bf2231a4a
Change-Id: I7d1f85e030615fff0de170ec87f78a4780d49b57
2017-03-03 17:53:25 +00: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
2f2d4b79b5
Merge "Fix for compile error when BUILD_HEADER_LIBRARY is used" am: 69e8252aec
...
am: e4f88be6ed
Change-Id: Ia7e126b063378e454b3a0d41c546c41de025c8f0
2017-03-03 04:18:09 +00: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
d485d2a10c
Merge "Include secilc and sepolicy conditionally, elsewhere" am: 3e78704825
...
am: 8fe478de64
Change-Id: I124bacdd15ad7edd1f5527005a726641c7c96d08
2017-03-03 03:59:39 +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
decc92028b
Merge "Add local preopt options for generating app image and profile" am: fea31c0b9e
...
am: c185f742e1
Change-Id: Ifbe9e3247a1aed1c63918fc79da180880efb2e6b
2017-03-03 01:20:13 +00: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
27fdb81511
Merge "Enable secondary dex compilation in the background dexopt job" am: 34200a1ad1
...
am: a5ab384e1c
Change-Id: I68d3c5ae807d0a61a80ceddc7add2f0cdcfb1cc8
2017-03-03 00:21:34 +00: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
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