Commit Graph

42865 Commits

Author SHA1 Message Date
Badhri Jagan Sridharan b3a8877cf7 Merge "Build usbd" am: c8cdf75d1b am: a5d0ec68bf
am: 56d3c63a3a

Change-Id: I77f30caf960067d09df8981257abc72d33135e1a
2018-01-23 18:52:49 +00:00
Tianjie Xu 6b3337db4a Merge "Don't check the stderr output from bsdiff/imgdiff" am: 07a4299182
am: 759dcbd1ed

Change-Id: If17dcdb8daaf74325bcbc9ae2ef0ba1932a30e94
2018-01-23 18:48:09 +00:00
Jiyong Park 2c975edc0e Merge "Add PLATFORM_SYSTEMSDK_VERSIONS and BOARD_SYSTEMSDK_VERSIONS" am: ae891fb19e
am: 4de1dc97c0

Change-Id: Ie3104726801d314058c059691e2fef77da07e9e7
2018-01-23 18:47:21 +00:00
Badhri Jagan Sridharan 56d3c63a3a Merge "Build usbd" am: c8cdf75d1b
am: a5d0ec68bf

Change-Id: I56c167913151dff21b230b7fe0b0a0a730edce63
2018-01-23 18:41:50 +00:00
Tianjie Xu 759dcbd1ed Merge "Don't check the stderr output from bsdiff/imgdiff"
am: 07a4299182

Change-Id: I3f237e1bb6e000b5bd98d6653c7d53e454a3c3e6
2018-01-23 18:39:01 +00:00
Jiyong Park 4de1dc97c0 Merge "Add PLATFORM_SYSTEMSDK_VERSIONS and BOARD_SYSTEMSDK_VERSIONS"
am: ae891fb19e

Change-Id: I7823d7c0b97fd2f7b3d2f757b3dc76ef848eea7d
2018-01-23 18:38:09 +00:00
Badhri Jagan Sridharan a5d0ec68bf Merge "Build usbd"
am: c8cdf75d1b

Change-Id: I187f1f262f3feba3b6210e4f0994c9aa05bf4cc7
2018-01-23 18:33:24 +00:00
Paul Duffin 3a4f2ed718 Conditionally remove oahl from bootclasspath
If REMOVE_OAHL_FROM_BCP=true then this adds the
framework-oahl-backward-compatibility library to the bootclasspath.

Otherwise, it adds the org.apache.http.legacy instead.

Bug: 18027885
Bug: 72375096
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I17170f873eec93b2e2ed7be3459e2d28c96bbe4c
2018-01-23 17:11:24 +00:00
Søren Gjesse ca48094d03 Revert "Enable R8 by default (fifth attempt)"
This reverts commit 1d4e668cf9.

Reason for revert: b/72373167

Change-Id: I913869aed9061aae8da18165b3a3167a52bad486
2018-01-23 16:18:23 +00:00
Adrian Roos 16d5fc1afe Merge "DisplayCutout: Add cutout emulation flavors to generic build target" 2018-01-23 15:23:55 +00:00
Justin Yun e3a7b1b4ca Install ld.config.noenforce.txt instead of copying it
ld.config.noenforce.txt is defined as a module.
For GSI, install the module instead of copying it.

Bug: 70704112
Bug: 70603313
Test: Build GSI and boot on Android-P sailfish device
Change-Id: I894921fa3089411f60d1b4f58ad48e9aa25a519b
2018-01-23 16:13:33 +09:00
Tianjie Xu 07a4299182 Merge "Don't check the stderr output from bsdiff/imgdiff" 2018-01-23 06:10:46 +00:00
Søren Gjesse f97f420e6a Merge "Enable R8 by default (fifth attempt)" 2018-01-23 04:56:47 +00:00
Treehugger Robot ae891fb19e Merge "Add PLATFORM_SYSTEMSDK_VERSIONS and BOARD_SYSTEMSDK_VERSIONS" 2018-01-23 03:35:19 +00:00
Yifan Hong 1909b0c362 Merge "Add System SDK Versions to VINTF." am: c4d2725fc6 am: 1738a2315a
am: fed5564e84

Change-Id: Ic33c36bce173753d67918f6a94886ec7a7e6c0e0
2018-01-23 03:17:42 +00:00
Yifan Hong fed5564e84 Merge "Add System SDK Versions to VINTF." am: c4d2725fc6
am: 1738a2315a

Change-Id: I49be38ceec32d811eab11b45339e24c35c0faef0
2018-01-23 03:12:36 +00:00
Badhri Jagan Sridharan c8cdf75d1b Merge "Build usbd" 2018-01-23 03:09:27 +00:00
Yifan Hong 1738a2315a Merge "Add System SDK Versions to VINTF."
am: c4d2725fc6

Change-Id: I4e634fdeecbb1201514b0cc979eb7706513f653a
2018-01-23 03:07:33 +00:00
Yifan Hong c4d2725fc6 Merge "Add System SDK Versions to VINTF." 2018-01-23 02:57:29 +00:00
Tianjie Xu a2a9f9990f Don't check the stderr output from bsdiff/imgdiff
bsdiff/imgdiff returns non-zero values correctly in case of failures.
So we don't need to check the stderr anymore. This avoids some false
reports of the diff program.

Bug: 72335938
Bug: 71505046
Test: Check the exit value of bsdiff/imgdiff in code search,
      generate a package for angler.

Change-Id: I18f0c3882a40a5288d6aee715713a05270e0db2b
2018-01-23 01:29:56 +00:00
Jin Qian fde9f7906b Add BOARD_EXT4_SHARE_DUP_BLOCKS to share duplicated blocks on ext4
This option applies to system.img and vendor.img.

Bug: 64109868
Change-Id: Ib4c7384049dca08e57441ef71cc81c2fba4462dd
2018-01-22 17:21:11 -08:00
Tao Bao 718707e403 Merge "releasetools: Track the change to BuildInfo." into oc-mr1-dev-plus-aosp
am: 412e36c6e3

Change-Id: I5cc36eb90a71a6df9c617f0fbcb53a7b8306f003
2018-01-22 22:23:28 +00:00
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