Commit Graph

6962 Commits

Author SHA1 Message Date
Rahul Chaudhry eae3a62827 Merge "Revert "Disable relocation_packer and migrate to SHT_RELR sections."" am: fd5059ff10
am: c9e08d397c

Change-Id: I845618811532032f7d9193e954ecf750041f2aa6
2018-03-24 06:52:47 +00:00
Rahul Chaudhry c9e08d397c Merge "Revert "Disable relocation_packer and migrate to SHT_RELR sections.""
am: fd5059ff10

Change-Id: I09344ed0beaf3ad01bd090490970149f7856feb1
2018-03-23 20:03:42 +00:00
Rahul Chaudhry fd5059ff10 Merge "Revert "Disable relocation_packer and migrate to SHT_RELR sections."" 2018-03-23 19:45:22 +00:00
Rahul Chaudhry ccf4f83887 Revert "Disable relocation_packer and migrate to SHT_RELR sections."
This reverts commit fa00dfda13.

Reason for revert: New Build Breakages in git_pi-dev-plus-aosp-without-vendor/aosp_walleye-userdebug and git_pi-dev-plus-aosp/aosp_crosshatch-userdebug

Change-Id: Iec9e695cccc3f206df67f0c01cfd4c2c3023dcec
2018-03-23 19:02:56 +00:00
Rahul Chaudhry b007f56ba8 Merge "Disable relocation_packer and migrate to SHT_RELR sections." am: 71bfb262b9
am: 6ad7e6a605

Change-Id: Ic0c3e14c3e1b3e91f45572134e45b9f865180d07
2018-03-23 17:53:05 +00:00
Rahul Chaudhry 6ad7e6a605 Merge "Disable relocation_packer and migrate to SHT_RELR sections."
am: 71bfb262b9

Change-Id: I561ea145f3a152ae2096c9e54ac68054ee26cba5
2018-03-23 17:47:28 +00:00
Treehugger Robot 71bfb262b9 Merge "Disable relocation_packer and migrate to SHT_RELR sections." 2018-03-23 17:28:08 +00:00
Dan Willemsen 22d5f40e59 [automerger skipped]Allow proto properties in cc/java_defaults
am: b785b61621  -s ours

Change-Id: I444e25311229d0e6a422e514c8f23b318715b87f
2018-03-23 06:27:45 +00:00
Dan Willemsen b785b61621 Allow proto properties in cc/java_defaults
(cherry picked from commit 6424d17a2d)

Bug: 73175642
Test: Add proto.canonical_path_from_root: true in a cc_defaults
Test: Add proto.canonical_path_from_root: true in a java_defaults
Merged-In: I9ddfc8af0025705a34b6e487225f1f98915054c3
Change-Id: I9ddfc8af0025705a34b6e487225f1f98915054c3
2018-03-22 20:51:04 -07:00
Nan Zhang de256c1d21 Add Python protobuf support. am: b8fa197878
am: 4d626eadf8

Change-Id: I415cc70fc5b1648b91e1a9cd6db78517ddaeff18
2018-03-23 01:48:07 +00:00
Nan Zhang 4d626eadf8 Add Python protobuf support.
am: b8fa197878

Change-Id: I7ad1f240191c560934aab7980cd3eac6fe625f8e
2018-03-23 01:42:05 +00:00
Colin Cross 9b1ffa16de Make zipsync list file output empty if there are no files am: 628d55d7ef
am: 7aa81ff0b4

Change-Id: I23762b3ef0d2a81661ed0fdd97c4d83cbb4f0c30
2018-03-22 22:58:52 +00:00
Nan Zhang b8fa197878 Add Python protobuf support.
Python protobuf std libs will be wrapped in final binary/test par file.

Bug: b/70568913
Test: manually create real examples.
Change-Id: I7376ec9175f3e03d1adbd20858a7f74e826387ad
2018-03-22 15:56:51 -07:00
Colin Cross 7aa81ff0b4 Make zipsync list file output empty if there are no files
am: 628d55d7ef

Change-Id: I0aa3b5661faf93015bccd3cf12f5a4c70a261a3a
2018-03-22 22:48:13 +00:00
Rahul Chaudhry fa00dfda13 Disable relocation_packer and migrate to SHT_RELR sections.
Proposal for adding SHT_RELR sections in the generic-abi is at
https://groups.google.com/forum/#!topic/generic-abi/bX460iggiKg

Comparison with relocation_packer for aosp_marlin-userdebug:
$ du -B1 -s */out/target/product/marlin/system
 996958208      base/out/target/product/marlin/system
1008340992      no_pack/out/target/product/marlin/system
 997801984      sht_relr/out/target/product/marlin/system

base contains a build with current settings.
no_pack contains a build with relocation_packer disabled.
sht_relr contains a build with SHT_RELR sections enabled.

relocation_packer was saving 11,382,784 bytes (no_pack - base).
SHT_RELR sections are saving 10,539,008 bytes (no_pack - sht_relr).

Bug: None
Test: Built aosp_marlin-userdebug image, boots on device.
Test: Built aosp_x86_64-userdebug image, boots in emulator.
Change-Id: I448dc95baa4976b68ce2659b80498539426775f9
2018-03-22 15:17:34 -07:00
Ivan Lozano 67106e5309 [automerger skipped]Merge "Add minimal-runtime support for integer overflows." into pi-dev
am: 3cc0480d16  -s ours

Change-Id: I59714852429ef37ad0ca35b4d0a741c5dd1967a1
2018-03-22 20:39:37 +00:00
Ivan Lozano 74235d4b58 [automerger skipped]Add minimal-runtime support for integer overflows.
am: 954f430e97  -s ours

Change-Id: I84e4008ed216ed81f2ba0afe6a39707a87db3aac
2018-03-22 20:38:15 +00:00
Ivan Lozano 3cc0480d16 Merge "Add minimal-runtime support for integer overflows." into pi-dev 2018-03-22 20:17:38 +00:00
Colin Cross 628d55d7ef Make zipsync list file output empty if there are no files
The make javac rule uses [ -s srcjar-list ] to decide whether or
not to run javac.  zipsync was putting a trailing "\n" in the
list file, so the file was never empty.  There was one case of a
package that contained no source files (so java-source-list was
empty) and had a res directory with an xml file that declared no
resources (so aapt.jar was created but empty).  The 1-byte
srcjar-list file caused javac to run and error with:
javac: no source files

Test: m checkbuild
Change-Id: I26b394b66bf81e4f5abbd27e4dc06bee1d9420a8
2018-03-22 13:02:39 -07:00
Logan Chien 786b6f4a99 [automerger skipped]Merge changes I406c5bef,Ibde685d7,I1c09412d,I9bec563c,I34f06abd into pi-dev
am: 7921d2d265  -s ours

Change-Id: I408bb83b90457368d852ed7aba2041e0abaebccc
2018-03-22 07:49:39 +00:00
Logan Chien 7921d2d265 Merge changes I406c5bef,Ibde685d7,I1c09412d,I9bec563c,I34f06abd into pi-dev
* changes:
  Allow VNDK extensions under vendor or device
  Add unit tests for android/neverallow.go
  Extract failIfErrored() to android/testing.go
  RemoveFromList() should remove all matches
  Add unit tests for android/util.go
2018-03-22 07:36:51 +00:00
Victor Khimenko 1913574ba6 Merge "Make arm_on_x86 symmetric" am: 9f66306050
am: 069a412cdc

Change-Id: Ie345c0303e5f7bb54c698e14ac4d9a793cbea9a8
2018-03-22 06:29:02 +00:00
Victor Khimenko 069a412cdc Merge "Make arm_on_x86 symmetric"
am: 9f66306050

Change-Id: I3d935f0f36d415fdffc5e92c4b678dc13ef46b4e
2018-03-22 06:23:33 +00:00
Victor Khimenko 9f66306050 Merge "Make arm_on_x86 symmetric" 2018-03-22 06:13:34 +00:00
Nan Zhang 297cae9545 Fix the issue for incorrect logic of "no_framework_libs" am: 9cbe677024
am: e715f2de51

Change-Id: I6e462f02e33c52811031999f90a56e3de1b0abc9
2018-03-22 05:20:32 +00:00
Nan Zhang e715f2de51 Fix the issue for incorrect logic of "no_framework_libs"
am: 9cbe677024

Change-Id: I2daf3e97d3458250f6b075317f6bef80a1172599
2018-03-22 05:14:30 +00:00
Nan Zhang 9cbe677024 Fix the issue for incorrect logic of "no_framework_libs"
Fortunately Android stubs jar generation didn't get affected by this
issue since "framework" and "ext" were explicitly added to the "libs"
property:

https://cs.corp.google.com/aosp-master/frameworks/base/Android.bp?rcl=72fa61b3250529504a9f5dab2e927a0d2e873f58&l=876

Test: m -j android_stubs_current and check the build.ninja to see if
addtional "framework" and "lib" are shwon there.
Bug: b/70351683

Change-Id: I9f1eec0d7f8baff6361efef064b7a09a5b2d4a58
2018-03-21 17:56:39 -07:00
Victor Khimenko 5eb8ec1e72 Make arm_on_x86 symmetric
We only define arm_on_x86 in the x86 code, but sometimes arm code needs
to know that it's working in the emulated mode, too.

Test: CtsRsCppTestCases

BUG=75971275

Change-Id: I99564fbe9aeb284e2f11ffb593b18536a7755ea5
2018-03-21 20:30:54 +01:00
Ivan Lozano 954f430e97 Add minimal-runtime support for integer overflows.
Adds Soong support for -fsanitze-minimal-runtime when using
the integer overflow sanitizers. This makes the crashes due to these
sanitizers less mysterious.

Bug: 64091660
Test: Compiled and checked the generated compiler commands
Test: Checked program that overflows for the abort reason

Change-Id: Ieeceaf6c35c8371592952d3b8b977aefc11601c5
Merged-In: Ieeceaf6c35c8371592952d3b8b977aefc11601c5
(cherry picked from commit 30c5db2f47)
2018-03-21 10:04:53 -07:00
Colin Cross 88f453d49d Replace extract-srcjars.sh with zipsync tool
am: 0a7d85a896  -s ours

Change-Id: I2cb61d04ded1445446e44d3476f34a6c8bf962bb
2018-03-21 16:10:52 +00:00
Colin Cross 503818aebc Use turbine's native source jar support
am: f2986f067b  -s ours

Change-Id: I82ecb07760ce0d3a75accafe4860ab0d31df1fb1
2018-03-21 16:10:46 +00:00
Przemyslaw Szczepaniak 7fa4e00a65 Merge "Add support for renamed kotlin stdlib." am: 170ab730ec
am: b4c92f71ac

Change-Id: Ic4e36748bc28fee5196c097db9abc7ae20a8cdd2
2018-03-21 10:36:09 +00:00
Przemyslaw Szczepaniak b4c92f71ac Merge "Add support for renamed kotlin stdlib."
am: 170ab730ec

Change-Id: Ibf9f123def0978cdc3c00276bcce372b5e6fac2a
2018-03-21 10:28:07 +00:00
Przemyslaw Szczepaniak 170ab730ec Merge "Add support for renamed kotlin stdlib." 2018-03-21 10:16:19 +00:00
Nan Zhang a6901522a1 Changes *api_filename properties droiddoc.go am: 28c68b9a76
am: e2dbc2c6d7  -s ours

Change-Id: I2dbc36cd6273110f7d5037fb9f2f4139788b62a8
2018-03-21 04:29:11 +00:00
Nan Zhang 6273e8a2b3 Changes *api_filename properties droiddoc.go
Test: check build.ninja, and compare file content.
Bug: b/70351683
Change-Id: I385100f5c5c5354bec04a6435b735e92834a3512
Merged-In: I385100f5c5c5354bec04a6435b735e92834a3512
2018-03-20 16:23:54 -07:00
Nan Zhang e2dbc2c6d7 Changes *api_filename properties droiddoc.go
am: 28c68b9a76

Change-Id: Ib67c784feca19a7cfb67939559cfdcd825c6abec
2018-03-20 22:03:55 +00:00
Nan Zhang 28c68b9a76 Changes *api_filename properties droiddoc.go
Test: check build.ninja, and compare file content.
Bug: b/70351683
Change-Id: I385100f5c5c5354bec04a6435b735e92834a3512
Merged-In: I385100f5c5c5354bec04a6435b735e92834a3512
2018-03-20 11:40:50 -07:00
Colin Cross 0a7d85a896 Replace extract-srcjars.sh with zipsync tool
extract_srcjars.sh uses zipinfo and unzip, which fail with an
error on an empty zip file.  Instead of trying to hack around
this (which is hard to make guarantees for since they are
non-hermetic host tools), replace them with a go tool to unzip
a set of zip files into a directory.

Bug: 73885582
Test: m checkbuild
Change-Id: I151fed347ed5196726e36866ffc27bc831799afb
Merged-In: I151fed347ed5196726e36866ffc27bc831799afb
(cherry picked from commit 436b76564d)
2018-03-20 11:21:42 -07:00
Colin Cross f2986f067b Use turbine's native source jar support
Turbine doesn't need extract_srcjars.sh, just pass the source jars
with --source_jars.

Bug: 74339924
Test: m checkbuild
Change-Id: Ie7fe06f5a9f5e29287cf79c2d46b23a676a03d41
Merged-In: Ie7fe06f5a9f5e29287cf79c2d46b23a676a03d41
(cherry picked from commit 6981f658ef)
2018-03-20 11:21:42 -07:00
Przemyslaw Szczepaniak 66c0c4067f Add support for renamed kotlin stdlib.
Added new CompilerProperty flag, rename_kotlin_stdlib, which
allow to build kotlin libraries/binaries that use platform internal
version of kotlin stdlib (com.android.kotlin.*). This way, app-provided
kotlin standard library won't collide with version used internaly.

+ remove kotlinc-build.xml after compilation so it won't end up in the
result jar file

+ remove *.kotlin_module and *.kotlin_bultin filesfrom result jar file.
These files are needed only by kotlin-reflect library and
need more work to support kotlin-stdlib renaming.

Bug: 73281388
Test: java_test.go
Change-Id: Iae7ccb919e2ae9853b3f30f3dd447ebd01a1bed0
2018-03-20 12:55:19 +00:00
Colin Cross 61ea4cf419 Merge "Mark generated renderscript header files as implicit outputs" am: bfe65a32bb
am: 3e7c9ec5b3

Change-Id: I0dc4a12032a175eea3afbeef8ae04c526f479f2c
2018-03-20 08:22:50 +00:00
Colin Cross 3e7c9ec5b3 Merge "Mark generated renderscript header files as implicit outputs"
am: bfe65a32bb

Change-Id: I4b47112d20ff54ec92cd76a14ea6dd05076fb401
2018-03-20 08:13:47 +00:00
Treehugger Robot bfe65a32bb Merge "Mark generated renderscript header files as implicit outputs" 2018-03-20 08:04:32 +00:00
Colin Cross 80e6054eab Mark generated renderscript header files as implicit outputs
If a generated renderscript header is referenced by a cpp file
clang will insert a depsfile dependency on the header.  If the
generator rule does not include the header as an output, ninja
will not consider the cpp file dirty after the generator runs,
and not rebuild it.  On the next build, it will see that the
timestamp of the generated header is new and consider the cpp
file dirty.

Mark the header files as implicit outputs of the generator.

Bug: 75982985
Test: m libstagefright_mediafilter
      touch frameworks/av/media/libstagefright/filters/saturationARGB.rs
      m libstagefright_mediafilter
      m libstagefright_mediafilter

Change-Id: I3ac899322fe9cae2a6e4171092740339ef844494
2018-03-19 22:44:29 -07:00
Yi Kong 155ee3fcf9 Merge "Add opt-in option to turn on ThinLTO caching" am: 04a0fe3245
am: 341f92df33

Change-Id: Ic69ee703e467ea3570fb22102261105599e716ac
2018-03-19 22:26:54 +00:00
Yi Kong 341f92df33 Merge "Add opt-in option to turn on ThinLTO caching"
am: 04a0fe3245

Change-Id: I5155c5cca0b31e1361df95c3fe1f595fde656731
2018-03-19 22:20:18 +00:00
Yi Kong 04a0fe3245 Merge "Add opt-in option to turn on ThinLTO caching" 2018-03-19 22:03:15 +00:00
Chih-Hung Hsieh 63eb06037a Merge "Use armv7a-linux-androideabi for arm device triple." am: 4d693a7a27
am: ada684f304

Change-Id: I6055f1e39c3bb843b30199c8a0a58bf048203b46
2018-03-19 21:08:49 +00:00
Colin Cross 01801b3f50 Merge "Replace extract-srcjars.sh with zipsync tool" am: 21f8080d86
am: c48f545d17

Change-Id: Ia3f9cfd8f5d2e9ec11e64c8ef3cd63d1d5742ff2
2018-03-19 21:01:57 +00:00