Commit Graph

43543 Commits

Author SHA1 Message Date
Yifan Hong
5ff1f0a38a Add System SDK Versions to VINTF.
Add PLATFORM_SYSTEMSDK_VERSIONS to framework manifest
and BOARD_SYSTEMSDK_VERSIONS to device comp matrix.

Test: m framework_manifest.xml -j
Test: BOARD_SYSTEMSDK_VERSIONS=P m device_compatibility_matrix.xml -j

Bug: 69088799
Change-Id: I0b5ac6f1c2802c353b2989b017c1cdfc9fe27987
2018-01-22 14:18:16 -08:00
Tao Bao
412e36c6e3 Merge "releasetools: Track the change to BuildInfo." into oc-mr1-dev-plus-aosp 2018-01-22 22:12:05 +00:00
Steven Moreland
274b1a5f7f Merge "Add 'blank_screen' to embedded.mk." am: 9b8fc9e3c2 am: ec92f0e5cd
am: 0e79a7750a

Change-Id: Ic3ad9c5cffa775c04839d2c6fad57adbab3e1a4e
2018-01-22 20:43:26 +00:00
Steven Moreland
0e79a7750a Merge "Add 'blank_screen' to embedded.mk." am: 9b8fc9e3c2
am: ec92f0e5cd

Change-Id: I12a5f8c46553a5d08189f7d4269dde155f8e05d6
2018-01-22 20:38:49 +00:00
Steven Moreland
ec92f0e5cd Merge "Add 'blank_screen' to embedded.mk."
am: 9b8fc9e3c2

Change-Id: Ie416c988e8273fba9be5cb7cad9799159d48c76c
2018-01-22 20:35:05 +00:00
Treehugger Robot
9b8fc9e3c2 Merge "Add 'blank_screen' to embedded.mk." 2018-01-22 20:27:17 +00:00
Nicolas Geoffray
e166291e64 Merge "Don't strip for eng builds." am: 12c68db516 am: abfb75d66f
am: d1cca1967c

Change-Id: I79ef1e95e3cda2f839a0cc2ec9103844d4b8c909
2018-01-22 20:24:15 +00:00
Nicolas Geoffray
d1cca1967c Merge "Don't strip for eng builds." am: 12c68db516
am: abfb75d66f

Change-Id: Ie8dae5e16e66f6478813e116cf8c4fe99130b1bb
2018-01-22 20:08:58 +00:00
Nicolas Geoffray
abfb75d66f Merge "Don't strip for eng builds."
am: 12c68db516

Change-Id: I7eb2b83ae67a10e0fce727a7aefbb7025c63233b
2018-01-22 19:58:33 +00:00
Treehugger Robot
12c68db516 Merge "Don't strip for eng builds." 2018-01-22 19:51:12 +00:00
Tao Bao
2a12ed7dbd releasetools: Track the change to BuildInfo.
The global GetBuildProp() has been factored into BuildInfo class.

ota_from_target_files stderr: Traceback (most recent call last):
  File "/tmp/otatest1734786148718419730/releasetools/ota_from_target_files.py", line 1509, in <module>
    main(sys.argv[1:])
  File "/tmp/otatest1734786148718419730/releasetools/ota_from_target_files.py", line 1421, in main
    source_file=OPTIONS.incremental_source)
  File "/tmp/otatest1734786148718419730/releasetools/ota_from_target_files.py", line 1117, in WriteABOTAPackageWithBrilloScript
    max_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.source_info_dict)
NameError: global name 'GetBuildProp' is not defined

Test: Build an incremental A/B package with "--downgrade" flag.
Change-Id: I5c304c8b1ea79f3e5465b203bb990cbdffb9b328
2018-01-22 11:37:28 -08:00
Tao Bao
fd65d676f0 Merge "releasetools: Add PayloadSigner class." am: 8413824f4b am: 9704dddd1f
am: 7e7e6a3005

Change-Id: I2761ccd77557d392500745d4d46766b2604b47db
2018-01-22 19:07:37 +00:00
Tao Bao
7e7e6a3005 Merge "releasetools: Add PayloadSigner class." am: 8413824f4b
am: 9704dddd1f

Change-Id: I61e2ca212ce17edd3c9d5b5d733101e9ecdaeb10
2018-01-22 19:05:08 +00:00
Tao Bao
9704dddd1f Merge "releasetools: Add PayloadSigner class."
am: 8413824f4b

Change-Id: I887444e9df1a3ebd5af3e3ce82128a5f4d43cae9
2018-01-22 19:02:39 +00:00
Treehugger Robot
8413824f4b Merge "releasetools: Add PayloadSigner class." 2018-01-22 18:54:57 +00:00
Søren Gjesse
1d4e668cf9 Enable R8 by default (fifth attempt)
Fixed bugs which was discovered in the last attempt.

Bug: 70878367

Test: m -j PRODUCT-taimen-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: Ib08a0bf8daac8898b09755bf0cb3d89c81c2b09e
2018-01-22 17:37:05 +01:00
Nicolas Geoffray
ed6ee7b64d Don't strip for eng builds.
bug: 72150787
Test: m
Change-Id: Ifdd403dfecb440e32c4d0c00a7543820b2098359
2018-01-22 15:07:37 +00:00
Nicolas Geoffray
c218a41c20 Merge "Tighter control of stripping in dex_preopt_odex_install." am: ec1fdc8813 am: ef29a15ac4
am: aa9a2e4af9

Change-Id: I622998242a20d8f4f8ee9fb2e0856180db44efe0
2018-01-22 13:49:33 +00:00
Nicolas Geoffray
aa9a2e4af9 Merge "Tighter control of stripping in dex_preopt_odex_install." am: ec1fdc8813
am: ef29a15ac4

Change-Id: I5cf557499126024d31df39435adac32675b19012
2018-01-22 13:47:03 +00:00
Nicolas Geoffray
ef29a15ac4 Merge "Tighter control of stripping in dex_preopt_odex_install."
am: ec1fdc8813

Change-Id: Iafe80b87b7054eebefba798b8debdb48e850d61a
2018-01-22 13:44:22 +00:00
Nicolas Geoffray
ec1fdc8813 Merge "Tighter control of stripping in dex_preopt_odex_install." 2018-01-22 13:37:56 +00:00
Tobias Thierer
1d160f630c Merge "Experimental feature: LOCAL_PATCH_MODULE option in .mk files." am: 4bb18a8a2e am: 38d784f152
am: 33130f97e3

Change-Id: Idb30848c98b01a4fec8c6afdaac56899fb0f8d5f
2018-01-22 11:48:35 +00:00
Tobias Thierer
33130f97e3 Merge "Experimental feature: LOCAL_PATCH_MODULE option in .mk files." am: 4bb18a8a2e
am: 38d784f152

Change-Id: I8f52e67380ee8c32993d9122ab17c9683a7bbb5b
2018-01-22 11:43:26 +00:00
Tobias Thierer
38d784f152 Merge "Experimental feature: LOCAL_PATCH_MODULE option in .mk files."
am: 4bb18a8a2e

Change-Id: If15fe3baba14c347be5ac1db668ada41db5da816
2018-01-22 11:37:48 +00:00
Tobias Thierer
4bb18a8a2e Merge "Experimental feature: LOCAL_PATCH_MODULE option in .mk files." 2018-01-22 11:34:18 +00:00
David Brazdil
b6c4635641 Merge "Add new API file names" am: 33bb091971 am: 6410668278
am: d0c9593802

Change-Id: I0dbdbc4391f321b527f99f73684bee89f4819729
2018-01-20 11:39:16 +00:00
David Brazdil
d0c9593802 Merge "Add new API file names" am: 33bb091971
am: 6410668278

Change-Id: Ib505b504f508332be5b7913b490b64348ebf5066
2018-01-20 11:29:28 +00:00
David Brazdil
6410668278 Merge "Add new API file names"
am: 33bb091971

Change-Id: Id5e2132459edf799d4f27232f3090e4b9ba982db
2018-01-20 11:21:07 +00:00
David Brazdil
33bb091971 Merge "Add new API file names" 2018-01-20 10:06:22 +00:00
Zhi An Ng
c1ad415862 Merge "Fix order of args passed to mksquashfsimage.sh" am: 8eae9fc5f5 am: 7db3875c4c
am: fffa70a1b7

Change-Id: Ie9b67865a5050438a91f37956b192290fe4a4ee4
2018-01-20 06:12:49 +00:00
Zhi An Ng
fffa70a1b7 Merge "Fix order of args passed to mksquashfsimage.sh" am: 8eae9fc5f5
am: 7db3875c4c

Change-Id: I7c6ee9fad1665bfe72a3ae6bb50cb06c1a20c20a
2018-01-20 06:09:41 +00:00
Zhi An Ng
7db3875c4c Merge "Fix order of args passed to mksquashfsimage.sh"
am: 8eae9fc5f5

Change-Id: I91f987d801aaface3787986eb868860911d8ebfc
2018-01-20 06:07:07 +00:00
Zhi An Ng
8eae9fc5f5 Merge "Fix order of args passed to mksquashfsimage.sh" 2018-01-20 05:59:48 +00:00
Ivan Lozano
a6477c91d4 Merge "Revert "Overflow sanitization in frameworks/ and system/."" am: a663b8fb1c am: f67c4bbcd8
am: a29ee1591c

Change-Id: Ifacfc96012324abe060e50417847e73a8572c727
2018-01-20 04:05:35 +00:00
Ivan Lozano
a29ee1591c Merge "Revert "Overflow sanitization in frameworks/ and system/."" am: a663b8fb1c
am: f67c4bbcd8

Change-Id: Ib09cff9930ffa6e86e1117e36e5355ff2192f20c
2018-01-20 04:02:58 +00:00
Ivan Lozano
f67c4bbcd8 Merge "Revert "Overflow sanitization in frameworks/ and system/.""
am: a663b8fb1c

Change-Id: I3f58578b40cdd522630063ab2cb2f0237e206d94
2018-01-20 04:00:23 +00:00
Treehugger Robot
a663b8fb1c Merge "Revert "Overflow sanitization in frameworks/ and system/."" 2018-01-20 03:54:23 +00:00
Denis Vnukov
0af9f0aa8c Merge "Revert "Enable R8 by default (fourth attempt)"" 2018-01-20 01:54:40 +00:00
Ivan Lozano
c5ef21febf Revert "Overflow sanitization in frameworks/ and system/."
This reverts commit c2d7db1c7d.

Change-Id: I3bab6a359bcec605a8120bf106bf121090eb63fe
2018-01-20 01:44:11 +00:00
Alex Klyubin
ad4c8fd0f6 Merge "Reland: Add boot.art.rel files to system image" am: 00844ccf77 am: dd9dc9b749
am: f7cb74004c

Change-Id: If95789ce57b3b852d04ab5206c28f13a01f12e2f
2018-01-20 01:16:08 +00:00
Alex Klyubin
f7cb74004c Merge "Reland: Add boot.art.rel files to system image" am: 00844ccf77
am: dd9dc9b749

Change-Id: I5d7a2d0a2504c5fb1db94ad0f40ecd2b97aa78ff
2018-01-20 01:13:33 +00:00
Alex Klyubin
dd9dc9b749 Merge "Reland: Add boot.art.rel files to system image"
am: 00844ccf77

Change-Id: I50677dabaf54d4fce17ac4653b3cae173e896522
2018-01-20 01:11:27 +00:00
Treehugger Robot
00844ccf77 Merge "Reland: Add boot.art.rel files to system image" 2018-01-20 01:01:29 +00:00
Ng Zhi An
9446c1df98 Fix order of args passed to mksquashfsimage.sh
Bug: 72234456
Test: make systemimage
Change-Id: I1b4b07f0a488eade2f297fea12d02b6e8ccba7d8
2018-01-19 15:55:39 -08:00
Denis Vnukov
37572f2dfe Revert "Enable R8 by default (fourth attempt)"
This reverts commit a7e1f92533.

Reason for revert: R8 seems to be a reason for b/72218788.

Change-Id: Ia2f12775b37537cb21036c4bdd5504af8344e830
2018-01-19 23:13:30 +00:00
TreeHugger Robot
bc1faab92a Merge "Remove default keymaster from emulator build." 2018-01-19 22:49:27 +00:00
Tao Bao
3bc775a4fc Merge "releasetools: Dump mkfs/fsck/simg2img outputs on error." am: 3221f0f387 am: c20b59eabe
am: ed184a50ea

Change-Id: If13865e513d12ad58e0874b6504ef777398df783
2018-01-19 22:48:17 +00:00
TreeHugger Robot
9f5be1e1ce Merge "Build: Do not treat org.apache.http.legacy.boot as boot classpath" 2018-01-19 22:46:19 +00:00
Tao Bao
ed184a50ea Merge "releasetools: Dump mkfs/fsck/simg2img outputs on error." am: 3221f0f387
am: c20b59eabe

Change-Id: Iede2a76f87298fc0c389883b4e57d87d32968fb6
2018-01-19 22:45:34 +00:00
Tao Bao
c20b59eabe Merge "releasetools: Dump mkfs/fsck/simg2img outputs on error."
am: 3221f0f387

Change-Id: I1fb22aa8bbd2d1497e62c41c090714942148e6ec
2018-01-19 22:43:30 +00:00