Commit Graph

35447 Commits

Author SHA1 Message Date
Colin Cross
c957f4202c Merge "Add a desugar step between javac and proguard" am: 9e92c2fd18 am: e4381dcac2
am: d48f9252d5

Change-Id: If02fc7dcd4bdc06aee3ca35b70da5568e41f0f62
2017-02-18 06:23:56 +00:00
Tao Bao
7ecc0dc0f7 Merge "Build FUTILITY tool from futility-host." am: c53607d9cc am: 6498b2efbf
am: f0e03f325f

Change-Id: I774bc0100ba69c38ddaf646aef1016a6168c5f77
2017-02-18 06:23:30 +00:00
Dan Willemsen
0c89af6a6a Merge "Remove unused zipalign macros" am: 56183c2ee2 am: e4a0dd15cc
am: d20c5e2a81

Change-Id: Id3a7d0f64d581376dcb38bc324f252ed99332a1a
2017-02-18 06:23:05 +00:00
Dan Willemsen
dc750c31ca Merge "Add Header Library support to Make" am: 4f794fdd50 am: ea2687fab6
am: 4a78c9e50f

Change-Id: I711c810cef8487c2d8e7b53deb9ccaad89592b1d
2017-02-18 06:22:20 +00:00
Pulkit Bhuwalka
23575449a8 Merge "Replace hardware features conf file to be emulator specific" am: afd7f4f453 am: 7be6f4c9fd
am: 7072f50067

Change-Id: I471cae79973e6a0cb13d6c2b2c6eb5de1c23fd74
2017-02-18 06:21:23 +00:00
Colin Cross
d48f9252d5 Merge "Add a desugar step between javac and proguard" am: 9e92c2fd18
am: e4381dcac2

Change-Id: I5c72358097629e3ffe597c517e86a38ffbf51d82
2017-02-18 01:15:21 +00:00
Colin Cross
e4381dcac2 Merge "Add a desugar step between javac and proguard"
am: 9e92c2fd18

Change-Id: I1bcbc1a9d98cad43b5f67f54b8e09de8bf8eb67b
2017-02-18 01:13:19 +00:00
Tao Bao
f0e03f325f Merge "Build FUTILITY tool from futility-host." am: c53607d9cc
am: 6498b2efbf

Change-Id: I72e7d16465a7975d0ad57a4258c23da507fcb594
2017-02-18 01:10:49 +00:00
Colin Cross
9e92c2fd18 Merge "Add a desugar step between javac and proguard" 2017-02-18 01:10:08 +00:00
Tao Bao
6498b2efbf Merge "Build FUTILITY tool from futility-host."
am: c53607d9cc

Change-Id: Ieabf4a622916a7ed18b0adac4f5091dcea96d659
2017-02-18 01:09:48 +00:00
Tao Bao
c53607d9cc Merge "Build FUTILITY tool from futility-host." 2017-02-18 01:04:31 +00:00
Dan Willemsen
d20c5e2a81 Merge "Remove unused zipalign macros" am: 56183c2ee2
am: e4a0dd15cc

Change-Id: Id086073bc8aaf01477ed8c360813929459110b40
2017-02-18 00:20:45 +00:00
Dan Willemsen
e4a0dd15cc Merge "Remove unused zipalign macros"
am: 56183c2ee2

Change-Id: I7c743f2b694652af35f74b0e61c3dfe290812b18
2017-02-18 00:18:45 +00:00
Treehugger Robot
56183c2ee2 Merge "Remove unused zipalign macros" 2017-02-18 00:12:42 +00:00
Dan Willemsen
4a78c9e50f Merge "Add Header Library support to Make" am: 4f794fdd50
am: ea2687fab6

Change-Id: I7b3ba92b8f329df796194fe4f608dab6b935c0bd
2017-02-17 23:57:16 +00:00
Dan Willemsen
ea2687fab6 Merge "Add Header Library support to Make"
am: 4f794fdd50

Change-Id: I44b0f0fe5c0f4d65bf205165e4ec05403f738066
2017-02-17 23:55:16 +00:00
Dan Willemsen
4f794fdd50 Merge "Add Header Library support to Make" 2017-02-17 23:50:41 +00:00
Pulkit Bhuwalka
7072f50067 Merge "Replace hardware features conf file to be emulator specific" am: afd7f4f453
am: 7be6f4c9fd

Change-Id: Id8e3da9c86583ab5f961fd70d6999038b54a72b9
2017-02-17 23:31:24 +00:00
Pulkit Bhuwalka
7be6f4c9fd Merge "Replace hardware features conf file to be emulator specific"
am: afd7f4f453

Change-Id: I52b0bc325e8fb8d72e40d947cd7e683ab415d10c
2017-02-17 23:28:19 +00:00
Treehugger Robot
afd7f4f453 Merge "Replace hardware features conf file to be emulator specific" 2017-02-17 23:20:25 +00:00
Colin Cross
b176192db4 Merge "Revert "Add soong_javac_filter to all javac commands"" am: 6dd4debe74 am: cb78c50239
am: 4db7d2d72b

Change-Id: I131feafdee7549a1668f8a5ec220284d808cc608
2017-02-17 23:06:41 +00:00
Colin Cross
eac5ce4e97 Add a desugar step between javac and proguard
This enables support for lambdas by passing class files through the
desugar tool.

Test: m -j checkbuild tests cts
Change-Id: I14ec152355243fd67fe2f107ccbe67a1b4e7e262
2017-02-17 15:03:06 -08:00
Colin Cross
4db7d2d72b Merge "Revert "Add soong_javac_filter to all javac commands"" am: 6dd4debe74
am: cb78c50239

Change-Id: I2a85d1855e4a013e6438a0b2ce5b0cf29aa6c3d6
2017-02-17 23:02:10 +00:00
Colin Cross
cb78c50239 Merge "Revert "Add soong_javac_filter to all javac commands""
am: 6dd4debe74

Change-Id: I31aedc360439bd26f205d6db1502297d7ca5b63a
2017-02-17 23:00:09 +00:00
Colin Cross
6dd4debe74 Merge "Revert "Add soong_javac_filter to all javac commands"" 2017-02-17 22:54:06 +00:00
Colin Cross
52d2253ff9 Revert "Add soong_javac_filter to all javac commands"
This reverts commit a341bf0f86.

Breaks grok builds that replace javac with another tool:
reading standard input: bufio.Scanner: token too long

Change-Id: I825587c465b05c1fbddb7794dc1c84f5f2c883d1
2017-02-17 22:53:42 +00:00
Colin Cross
9256be1822 Merge changes I7e8fcd2e,Ie12d743c am: 547f7393d7 am: 8283b186be
am: 7d8a028cd3

Change-Id: Ife691c9e00e766293e3648348e3c86b92f96fd56
2017-02-17 22:45:38 +00:00
Colin Cross
7d8a028cd3 Merge changes I7e8fcd2e,Ie12d743c am: 547f7393d7
am: 8283b186be

Change-Id: I6404f454941195d60cbd222adb3e6912376966c7
2017-02-17 22:36:36 +00:00
Colin Cross
8283b186be Merge changes I7e8fcd2e,Ie12d743c
am: 547f7393d7

Change-Id: Id9cd5b894a599ca660363234863fdfc6602575d2
2017-02-17 22:34:39 +00:00
Colin Cross
547f7393d7 Merge changes I7e8fcd2e,Ie12d743c
* changes:
  Add soong_javac_filter to all javac commands
  Re-enable dx support
2017-02-17 22:19:08 +00:00
Tao Bao
e98fb7a8d3 Build FUTILITY tool from futility-host.
Also pack the tool, vboot_signer.sh script and the test keys into
otatools.zip. This allows signing ryu target without a source repo.

Bug: 35467608
Test: m otatools-package and check the newly included files.
Test: Use otatools.zip to sign a ryu target.
Change-Id: I70f7b359f21a579463d5c7251daac81a97e338cc
2017-02-17 14:16:46 -08:00
Pulkit Bhuwalka
a118a21b00 Replace hardware features conf file to be emulator specific
full_base_telephoney.mk file gets used only for emulators which should
have bluetooth disabled. Using the default handheld_core_hardware.xml
file has bluetooth enabled. We should use the generic
handheld_core_hardware.xml file for emulators which has bluetooth
disabled.

Its presence causes problems upstream in SystemServer when
BluetoothService starts and requires an extra emulator config change
which should not be there.

Bug: 35361545
Test: Verified by launching Android Emulator. It works fine and does not
start bluetooth.

Change-Id: I484c3d5867f46853fb49f28422dd72ab362ed768
2017-02-17 13:46:01 -08:00
Steven Moreland
69249f1f53 embedded.mk: allocator service
We are splitting android.hidl.memory into android.hidl.allocator and
android.hidl.memory to reflect the fact that we have two separate
interfaces which are served over different transports.

Bug: 35327976
Test: hidl_test, device boots with allocator
Change-Id: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
2017-02-17 12:36:54 -08:00
Dan Willemsen
85acdfac58 Remove unused zipalign macros
Test: codesearch
Test: build-marlin.ninja is identical before/after (in internal master)
Change-Id: I1c5c39cabcc166b8e8608ace3290b7027d258624
2017-02-17 10:44:30 -08:00
Narayan Kamath
c85327b679 Merge "zipalign: remove support for adding members from gzip sources." am: 96a4bdd9a6 am: 080f68acf5 am: 8778583000
am: 6e5855f9ed

Change-Id: I7fec7afe032fd8b28ede1b64bb125f72370d98d8
2017-02-17 14:29:52 +00:00
Narayan Kamath
6e5855f9ed Merge "zipalign: remove support for adding members from gzip sources." am: 96a4bdd9a6 am: 080f68acf5
am: 8778583000

Change-Id: Ia3660fbc47245e63537b534028e8984c06459973
2017-02-17 14:24:52 +00:00
Narayan Kamath
8778583000 Merge "zipalign: remove support for adding members from gzip sources." am: 96a4bdd9a6
am: 080f68acf5

Change-Id: I8c8eb0405255df42a302406c68b3d702b85e0ead
2017-02-17 14:19:51 +00:00
Narayan Kamath
080f68acf5 Merge "zipalign: remove support for adding members from gzip sources."
am: 96a4bdd9a6

Change-Id: I9c7cd486fbebdc15724da435799d0f4b81f32982
2017-02-17 14:14:51 +00:00
Narayan Kamath
96a4bdd9a6 Merge "zipalign: remove support for adding members from gzip sources." 2017-02-17 14:07:34 +00:00
Colin Cross
5cf5d36882 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b am: 4cfa9fcd48 am: 5122f6fd67
am: 653470d457

Change-Id: Id83ed8cdb26736fabc5084f56c8de9e4d797551d
2017-02-17 03:59:11 +00:00
Colin Cross
653470d457 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b am: 4cfa9fcd48
am: 5122f6fd67

Change-Id: I7e13cea1775538c07e952c5770002777eca010bf
2017-02-17 03:50:39 +00:00
Colin Cross
5122f6fd67 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b
am: 4cfa9fcd48

Change-Id: I9fc141840a2b186b252bd2764344a9e791690ef6
2017-02-17 03:46:08 +00:00
Colin Cross
4cfa9fcd48 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION"
am: 738d2de20b

Change-Id: Ifd11e6aa6a38bedb75b5b9e8fda0649faa79b6d4
2017-02-17 03:41:07 +00:00
Treehugger Robot
738d2de20b Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" 2017-02-17 03:34:03 +00:00
Colin Cross
d3183bdf40 Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION
Create a default list of minor versions (v, vDR1, vDR2, vMR1, vMR2)
for O and P, and propagate TARGET_PLATFORM_VERSION to IS_AT_LEAST_*
variables.

Test: manual
Bug: 34610721
Change-Id: I575caa099d85ee6fbc79538e67dc8d621e81790f
2017-02-16 17:08:03 -08:00
Colin Cross
a341bf0f86 Add soong_javac_filter to all javac commands
soong_javac_filter colorizes javac output, and hides noisy messages.

Test: builds
Change-Id: I7e8fcd2e4e1ed3ff530a8ccfe931ceb7e411e0ad
2017-02-16 14:08:45 -08:00
Colin Cross
79e2f73b6c Re-enable dx support
This is a partial revert of commits:
858657366f Remove support of disabling Jack.
3ae7861252 Remove javac support in host dex rules.
22313f2b2a Remove rules for building dex with dx

Test: builds
Change-Id: Ie12d743cbe978bdeb030910848b67f5945a4fec8
2017-02-16 14:08:45 -08:00
Narayan Kamath
b46507ff9e zipalign: remove support for adding members from gzip sources.
This was vestigial code and never actually called anywhere.

Test: make
Bug: 35246701
Change-Id: I9297ac5fa030d369946857414155450635b65410
2017-02-16 10:53:09 +00:00
Dan Willemsen
8dae49c5e1 Add Header Library support to Make
We currently use static libraries without any source files to represent
header libraries, but Soong actually has cc_library_headers. So to
export those in a separate namespace from static libraries, implement
them in Make as well.

This also adds a nice pretty-warning / pretty-error macro that can be
used to print out standard warning messages pointing to the real source
file having the problem.

Test: Use a header library exported by Soong in a Make module
Change-Id: I3486539e247524cb82a20620745fc7be03014e14
2017-02-15 16:04:49 -08:00
Vishwath Mohan
fd317f84ab Merge "Blacklist code for CFI." am: 5f50896a7f am: f1e39159c8 am: cdf79d7298
am: 7832d8737d

Change-Id: Ibcc690ab5303c12298b55e4819c2448808cf3616
2017-02-15 23:44:51 +00:00