Adam Seaton
4507de1d0c
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
am: 9f7048b3b5
am: 7c50949d13
-s ours am: 595b11f9b8
am: dc48c433d5
am: 3dd51fb95a
am: 223d59710e
am: 19709747d8
-s ours am: 0693cd362b
...
am: 9f76abf94d
Change-Id: If2052a0876013f761929af9497ae87b8cbbe8b22
2017-08-22 17:48:02 +00:00
Adam Seaton
2b7d9b23c7
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours am: c5287e96a4
am: 0412b3d0e3
am: 2df41e5dec
am: 09ec3bc311
-s ours am: 9dbcf7c176
am: 3eac316736
...
am: 319003c0d8
Change-Id: Ice57fa9bb121fb12c3c6a0e29f89e06b7348e07c
2017-08-22 17:42:31 +00:00
Adam Seaton
9f76abf94d
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
am: 9f7048b3b5
am: 7c50949d13
-s ours am: 595b11f9b8
am: dc48c433d5
am: 3dd51fb95a
am: 223d59710e
am: 19709747d8
-s ours
...
am: 0693cd362b
Change-Id: I524225d2ee52180930f6471a932aca266de09f90
2017-08-22 17:42:31 +00:00
Adam Seaton
319003c0d8
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours am: c5287e96a4
am: 0412b3d0e3
am: 2df41e5dec
am: 09ec3bc311
-s ours am: 9dbcf7c176
...
am: 3eac316736
Change-Id: Iaa4d265c2217402121ed45b51d2eb103c4514f22
2017-08-22 17:39:59 +00:00
Adam Seaton
0693cd362b
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
am: 9f7048b3b5
am: 7c50949d13
-s ours am: 595b11f9b8
am: dc48c433d5
am: 3dd51fb95a
am: 223d59710e
...
am: 19709747d8
-s ours
Change-Id: I2606d2d5107274299369c0a8ac36723d5a306c98
2017-08-22 17:39:58 +00:00
Adam Seaton
3eac316736
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours am: c5287e96a4
am: 0412b3d0e3
am: 2df41e5dec
am: 09ec3bc311
-s ours
...
am: 9dbcf7c176
Change-Id: Ibf461a47aa1ebd43414f8a3e10b36c786ca3edac
2017-08-22 17:35:30 +00:00
Adam Seaton
19709747d8
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
am: 9f7048b3b5
am: 7c50949d13
-s ours am: 595b11f9b8
am: dc48c433d5
am: 3dd51fb95a
...
am: 223d59710e
Change-Id: I475cd7e51097f9915cfbebbeea55fc4ea1b221e3
2017-08-22 17:35:30 +00:00
Adam Seaton
223d59710e
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
am: 9f7048b3b5
am: 7c50949d13
-s ours am: 595b11f9b8
am: dc48c433d5
...
am: 3dd51fb95a
Change-Id: Ife215f435af3c5d52ab00c036786a3f341728ce0
2017-08-22 17:30:57 +00:00
Adam Seaton
9dbcf7c176
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours am: c5287e96a4
am: 0412b3d0e3
am: 2df41e5dec
...
am: 09ec3bc311
-s ours
Change-Id: I5fb22683f6e499656cbabd3ae452391fefff1ca9
2017-08-22 17:30:56 +00:00
Adam Seaton
3dd51fb95a
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
am: 9f7048b3b5
am: 7c50949d13
-s ours am: 595b11f9b8
...
am: dc48c433d5
Change-Id: I5d15a81e60f3ace4612bce83d3b23fce78dd12e4
2017-08-22 17:27:59 +00:00
Adam Seaton
09ec3bc311
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours am: c5287e96a4
am: 0412b3d0e3
...
am: 2df41e5dec
Change-Id: I44e724a1ae1c78ac10c6413e85c93702803eda0d
2017-08-22 17:27:59 +00:00
Adam Seaton
dc48c433d5
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
am: 9f7048b3b5
am: 7c50949d13
-s ours
...
am: 595b11f9b8
Change-Id: I46b088f22247d8801b883b5f57fd38a2c945cfa3
2017-08-22 17:25:28 +00:00
Adam Seaton
2df41e5dec
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours am: c5287e96a4
...
am: 0412b3d0e3
Change-Id: I7ffb634572190d260e9cefbda381114b0ff7537b
2017-08-22 17:25:28 +00:00
Adam Seaton
0412b3d0e3
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours
...
am: c5287e96a4
Change-Id: I129e68c1addd7715f135c1a80453e52e3fc66db1
2017-08-22 17:23:27 +00:00
Adam Seaton
595b11f9b8
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
am: 9f7048b3b5
...
am: 7c50949d13
-s ours
Change-Id: Ic87fb7997d16d0ffd53a9c5e0832d315ac641130
2017-08-22 17:23:26 +00:00
Adam Seaton
7c50949d13
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
...
am: 9f7048b3b5
Change-Id: I71139b08f59aba5e50478bdb256460a7963cd217
2017-08-22 17:21:00 +00:00
Adam Seaton
c5287e96a4
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
...
am: f1f39061a7
-s ours
Change-Id: I581219ddf6a09b037122c6eb4650392ae01b3737
2017-08-22 17:20:56 +00:00
Adam Seaton
9f7048b3b5
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
...
am: 3b9a25dc46
Change-Id: I7066b5941ac25cc276e7dabff6ae9be9aab50c9a
2017-08-22 17:18:58 +00:00
Adam Seaton
f1f39061a7
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours
...
am: 5c68c85011
Change-Id: I7ce43a00a8dc3ab19aad0110c434ea5d92d9d6cf
2017-08-22 17:18:57 +00:00
Adam Seaton
3b9a25dc46
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours
...
am: 286c80e90a
Change-Id: I7fc0c8c77629acf745ad25006e0d2369e438dbbd
2017-08-22 17:16:58 +00:00
Adam Seaton
5c68c85011
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours
...
am: bc464d7e8f
-s ours
Change-Id: Iabc705be0af053ce2c3d2e316db03f86e5f61fc5
2017-08-22 17:16:58 +00:00
Adam Seaton
286c80e90a
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
...
am: acc7e47faa
-s ours
Change-Id: I9d67def30e178e69c775efe69a13f74d85ee4459
2017-08-22 17:13:24 +00:00
Adam Seaton
bc464d7e8f
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
...
am: 47c92b6200
-s ours
Change-Id: Icca1344e8aca687cb67c0c5f565d31566f95530a
2017-08-22 17:13:24 +00:00
Adam Seaton
acc7e47faa
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours
...
am: b40465ed59
Change-Id: I224a4a9470e5666e1004dac3ce0d45d9e609ff04
2017-08-22 17:10:26 +00:00
Adam Seaton
47c92b6200
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
...
am: dafd187ab5
Change-Id: I83be94f8d716154b7c235f44bb8c2c63a38f4b62
2017-08-22 17:10:25 +00:00
Adam Seaton
b40465ed59
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113
...
am: cf83f5a4f3
-s ours
Change-Id: Id397af75994a345ab0f92d4ccad5b82732d51c3e
2017-08-22 17:07:54 +00:00
Adam Seaton
dafd187ab5
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113
...
am: f2f5343ba1
Change-Id: I8d79367624f8e1f8fe0e52374521b55f49e9ec83
2017-08-22 17:06:25 +00:00
Adam Seaton
4e140ce86a
Update platform security string to 2017-10-05 in oc-dev Bug:64896113
2017-08-21 11:37:32 -07:00
Adam Seaton
80d3742026
Update platform security string to 2017-10-01 in oc-dev Bug:64896113
2017-08-21 11:36:54 -07:00
Adam Seaton
1517f3d2da
[DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113
2017-08-21 11:26:49 -07:00
Adam Seaton
73ab80dec9
[DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113
2017-08-21 11:26:14 -07:00
Adam Seaton
cf83f5a4f3
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113
2017-08-21 11:08:37 -07:00
Adam Seaton
f2f5343ba1
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev
...
Bug:64896113
2017-08-21 10:52:18 -07:00
Narayan Kamath
a07bf049b9
releasetools: Add support for compressed APKs.
...
Compressed APKs can be identified by a "compressed=<ext>" entry in
the apkcerts.txt file. When we encounter such an entry, we need to
decompress the file to a temporary location before we process its
certs. When we're signing, we should also recompress the package
after it's signed.
Bug: 64531948
Test: ./build/tools/releasetools/check_target_files_signatures.py
Test: ./build/tools/releasetools/sign_target_files_apks.py
Test: compared signed output before / after this change, verify that
it's bitwise identical when no compressed APKs are present.
Change-Id: Id32e52f9c11023955330c113117daaf6b73bd8c2
2017-08-21 13:21:20 +01:00
TreeHugger Robot
76097d33b2
Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev
2017-08-21 01:39:05 +00:00
TreeHugger Robot
35f997178a
Merge "64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select" into oc-mr1-dev
2017-08-20 05:14:04 +00:00
TreeHugger Robot
ee67a45175
Merge "cxx_stl_setup is not executed for modules from soong" into oc-mr1-dev
2017-08-18 18:31:14 +00:00
Bowgo Tsai
882c99a33b
GSI: adds /odm mount point in root dir
...
Bug: 64700195
Test: boot A/B device with /odm
Change-Id: Ie014a052a333b2cb8d89bc43e4326be81e638dcd
2017-08-18 16:18:35 +08:00
Jiyong Park
82962a982c
cxx_stl_setup is not executed for modules from soong
...
cxx_stl_setup is adding libunwind_llvm to the dependency even for
modules from soong. However, since this dependency was already handled
in soong, those modules don't need to go through it again.
Bug: 64815735
Test: BOARD_VNDK_VERSION=current mma -j (under /hardware/libhardware)
Merged-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
Change-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
(cherry picked from commit 425d489cb9
)
2017-08-18 14:16:11 +09:00
TreeHugger Robot
b726558507
Merge "Copy adbd from system/bin to recovery/root/sbin" into oc-mr1-dev
2017-08-18 03:52:36 +00:00
Bowgo Tsai
cccd0b2a30
64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select
...
For 64-bit GSI, there are two different zygote settings:
1. 64-bit primary, 32-bit secondary (init.zygote64_32.rc) OR
2. 32-bit primary, 64-bit secondary (init.zygote32_64.rc)
3. 64-bit only is currently forbidden (b/64280459#comment6)
This change adds the second setting into root dir for vendor.img to
select. The first setting already exists.
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 is removed
because the property will be put into vendor.img. i.e., it has no effect
on GSI.
Bug: 64280459
Test: build and boot device, checks init.zygote32_64.rc is in rootdir
Change-Id: I16b36018acac8cfeee7281d6f4b6c9c19467abec
2017-08-18 11:29:45 +08:00
TreeHugger Robot
e6262be0d6
Merge "Apply vndk_package to generic system image" into oc-mr1-dev
2017-08-17 09:59:39 +00:00
SzuWei Lin
3cbe82df5f
Apply vndk_package to generic system image
...
Add vndk_package into PRODUCT_PACKAGES, which includes
HAL interfaces, VNDK, VNDK-SP and LL-NDK.
vndk_package increases the total size of GSI content, so
changes the system partition size of:
* 64 bits projects to 1.5GB
* 32 bits projects to 1.0GB
Bug: 64654641
Test: build all GSI projects
Change-Id: I3c66c966eceebd63ee19f6a3de778beed0be6de5
2017-08-17 15:12:53 +08:00
TreeHugger Robot
f01a5ef7c3
Merge "oc-mr1-dev is now 8.1.0" into oc-mr1-dev
2017-08-16 20:39:27 +00:00
TreeHugger Robot
1f8b6033cb
Merge "Move common 32/64 bits product settings to another files" into oc-mr1-dev
2017-08-15 16:53:08 +00:00
TreeHugger Robot
d215d9038b
Merge "Add com.android.location.provider to the system server classpath." into oc-mr1-dev
2017-08-15 10:10:24 +00:00
Narayan Kamath
fd6cbbe609
Merge "apkcerts: Add information about the compressed state of the APK." into oc-mr1-dev
2017-08-15 08:28:25 +00:00
Nicolas Geoffray
963485ecf7
Add com.android.location.provider to the system server classpath.
...
bug: 64571709
Test: com.android.location.provider is speed compiled in /system
(cherry picked from commit ec5e04096b
)
Change-Id: I179872125af89101bee7493f24687518cb39a0db
2017-08-15 08:33:09 +01:00
Bowgo Tsai
3147e7cfab
Copy adbd from system/bin to recovery/root/sbin
...
This change will be submitted with other changes moving adbd from
root/sbin to system/bin. We need to copy it specifically to recovery root.
Previously it was copied by rsync $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT).
Bug: 63910933
Test: normal boot sailfish, checks adb works
Test: recovery boot sailfish, checks adb works
Test: normal boot bullhead, checks adb works
Test: recovery boot bullhead, checks adb works
Change-Id: Ib49605f97a190aec2648cb000d1159b6e15db673
2017-08-15 11:33:17 +08:00
TreeHugger Robot
b5b4829c45
Merge "Reduce the system partition size of generic system images" into oc-mr1-dev
2017-08-15 00:49:50 +00:00