Commit Graph

13390 Commits

Author SHA1 Message Date
Colin Cross
2146d5642d Merge "Track sources for srcjars across modules" am: 082640d6ee
am: 222f5ee5f2

Change-Id: I1787ef4d66ebd129a15536b1455139235613ce2c
2019-05-07 10:43:23 -07:00
Colin Cross
222f5ee5f2 Merge "Track sources for srcjars across modules"
am: 082640d6ee

Change-Id: Ia5505e67614e1531acd9fed44491faef4596a62c
2019-05-07 10:38:18 -07:00
Treehugger Robot
082640d6ee Merge "Track sources for srcjars across modules" 2019-05-07 17:25:52 +00:00
Colin Cross
1cd8159cd3 Merge "Allow module types to generate resources" am: da2bba1d71
am: 04c69f1c9d

Change-Id: I4b3b77e49bd2e9d7fe22a97d52131da0a9a4e598
2019-05-07 09:45:00 -07:00
Yi Kong
fcd11c7c71 Merge "Exclude libgcc_stripped wherever libgcc is excluded" am: 3277c39c6b
am: 29ae56ede9

Change-Id: Iaeb5531631c175af08b2e0d96dfccd4ad25ea080
2019-05-07 09:42:38 -07:00
Colin Cross
04c69f1c9d Merge "Allow module types to generate resources"
am: da2bba1d71

Change-Id: I0ad142dadec08bd50ab8fdaa1f6dada0bf24a069
2019-05-07 07:36:39 -07:00
Treehugger Robot
da2bba1d71 Merge "Allow module types to generate resources" 2019-05-07 14:19:52 +00:00
Yi Kong
29ae56ede9 Merge "Exclude libgcc_stripped wherever libgcc is excluded"
am: 3277c39c6b

Change-Id: Idbe82ea4a3e5cb9a9a7c194dd0a4d8a282d56c03
2019-05-06 20:13:01 -07:00
Yi Kong
3277c39c6b Merge "Exclude libgcc_stripped wherever libgcc is excluded" 2019-05-07 02:57:24 +00:00
Patrice Arruda
d2e1149cc5 resolve merge conflicts of a3898089ba to qt-dev-plus-aosp
Bug: None
Test: Ran soong_ui.bash which compiles the soong_ui.
Change-Id: I0b8083e3e5ee69c8cbf17443fbc038ec7b5a0b10
2019-05-06 19:24:32 -07:00
Patrice Arruda
a3898089ba Merge "Soong: Refactor the soong_ui arguments processing to be more like bazel."
am: 565ee6ed87

Change-Id: I4dd6ef7ac341857201969a830d8caf76e28cdfd5
2019-05-06 18:32:11 -07:00
Treehugger Robot
565ee6ed87 Merge "Soong: Refactor the soong_ui arguments processing to be more like bazel." 2019-05-07 00:49:21 +00:00
Yi Kong
3d8792f7dd Exclude libgcc_stripped wherever libgcc is excluded
Test: manual testing
Bug: 130267141
Bug: 29275768
Change-Id: Icc0d50e403dc4a3592e5bf389101cdef129042df
2019-05-06 16:18:33 -07:00
Jaewoong Jung
514fd602b9 Merge "uncompressedDex option for android_app_import." am: ddda3ce23a
am: 6538ed7e72

Change-Id: I30230e28afd58c132049efa50b0aaee2ab6a57be
2019-05-06 14:42:25 -07:00
Jaewoong Jung
6538ed7e72 Merge "uncompressedDex option for android_app_import."
am: ddda3ce23a

Change-Id: I61d3cefceae2d53839477c65a15e69f4e863b952
2019-05-06 14:37:09 -07:00
Jaewoong Jung
ddda3ce23a Merge "uncompressedDex option for android_app_import." 2019-05-06 21:24:53 +00:00
Colin Cross
0c4ce21615 Track sources for srcjars across modules
Robolectric coverage needs a srcjar that sometimes needs to
include sources of dependencies.  Track the arguments and
dependencies necessary to jar the sources.

Test: TestIncludeSrcs
Change-Id: I9979d2b8350923a2237e743c232e6e548f54ba3b
2019-05-06 14:22:26 -07:00
Colin Cross
988708ce75 Allow module types to generate resources
Robolectric will need to generate extra resources to be added to
the jar.

Test: TestResources
Change-Id: I028f91ea8fc5d1e59e4e805876d70f57d8899f11
2019-05-06 14:22:26 -07:00
Patrice Arruda
a5c2542f68 Soong: Refactor the soong_ui arguments processing to be more like bazel.
Currently, the command line argments is being processed in multiple
places. In the main soong_ui arguments, there are several if statements
that checks if a specific argument was specified in order to execute
the requested operation. This does not scale well when adding or
removing a command in the near future. In order to support the build
commands (m, mma, etc...) from the envsetup.sh in soong_ui, a refactor
was required in order to add a command rather quickly and to have the
flexibiity to unit test the command. The soong_ui arguments format is
as follows:

soong_ui <command> [<arg 1> <arg 2> ... <arg n>]

The <command> is a specific operation to be executed. The arguments
after the command are processed by the command itself.

Below is the list of changes made in this commit:

 * Created a new command infrastructure that allows adding
   or deprecating a command easily.

 * Fixed a bug when running ./soong_ui.bash directly would cause
   a panic due to index being out of range for args list.

Bug: b/130049705
Test: Below is the list of testing done on this commit:
    * Ran lunch and verified that the output is the same as the the output
      without the modifications. lunch indirectly runs soong_ui passing
      in the --dumpvar-mode (to read makefile variables such as
      TARGET_PRODUCT) and --dumpvars-mode (to build the build cache).
    * Ran ./soong_ui.bash directly (with unsupported flags and no flags)
      and the proper message appeared that soong native UI is not yet
      available.
    * Ran m, mm, mmm, mma, mmma commands.
    * Ran the make installclean command:
         make -j80 TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=eng dist DIST_DIR=/tmp/helloworld installclean
    * Ran ./out/soong_ui -j80 --make-mode PRODUCT-aosp_arm64-eng dist checkbuild tests

Change-Id: Iee4de7ec0fa4661206fda8ae1fe6fa4487d9bb22
Merged-In: Iee4de7ec0fa4661206fda8ae1fe6fa4487d9bb22
2019-05-06 14:05:52 -07:00
Colin Cross
78c4474893 [automerger skipped] Merge "Revert "Strip libgcc to only keep fallback symbols"" into qt-dev
am: 00d764f7a7 -s ours
am skip reason: change_id I5b349fa6138e51663bf3b67109b880b4356da8e8 with SHA1 acee27cd72 is in history

Change-Id: Ic42f330a997e03ee3ceb1cedfa15575e19429d2e
2019-05-06 12:48:14 -07:00
Colin Cross
00d764f7a7 Merge "Revert "Strip libgcc to only keep fallback symbols"" into qt-dev 2019-05-06 19:33:02 +00:00
Patrice Arruda
628e320278 Merge "Soong: Add synopsis to ndk_prebuilt_* modules." am: e0dbdd87f0
am: 2a38d89734

Change-Id: Iebf89c24fc2786564e79223f3654d84f1714e90c
2019-05-06 11:49:58 -07:00
Patrice Arruda
2a38d89734 Merge "Soong: Add synopsis to ndk_prebuilt_* modules."
am: e0dbdd87f0

Change-Id: I757be447a4868755799c0cb40d21ed52989f9e7a
2019-05-06 11:37:08 -07:00
Treehugger Robot
e0dbdd87f0 Merge "Soong: Add synopsis to ndk_prebuilt_* modules." 2019-05-06 18:12:12 +00:00
dimitry
a0ea5845ca Mark libgcc_stripped native_bridge_supported am: 0e55ba6dbc
am: 96ba9ea6f9

Change-Id: Idd03b7a2d71629f938aac9ee5804979e7b930d59
2019-05-06 10:52:46 -07:00
dimitry
96ba9ea6f9 Mark libgcc_stripped native_bridge_supported
am: 0e55ba6dbc

Change-Id: I5f8c9616f1c4a935f4f06c1b642dbc8177917c88
2019-05-06 10:47:41 -07:00
Colin Cross
619cd098b6 Revert "Strip libgcc to only keep fallback symbols"
This reverts commit bd475367c3.

Reason for revert: b/130267141
Bug: 29275768
Bug: 130267141
Merged-In: I5b349fa6138e51663bf3b67109b880b4356da8e8
Change-Id: Ieab56390b27240ef7f2f52a48a673809da7bcf8e
2019-05-06 17:29:49 +00:00
dimitry
0e55ba6dbc Mark libgcc_stripped native_bridge_supported
Test: make
Change-Id: I04e86a4deb3e743a63fc6df199ee0c1a7deb9e48
2019-05-06 10:58:10 +02:00
Colin Cross
2847df1115 Merge "Support install-clean and data-clean" am: 6ff39230e8
am: 7e793aa12b

Change-Id: I6c7dcb21b0649bb816681c790d920bd10154d565
2019-05-03 17:47:31 -07:00
Elliott Hughes
44bf74c620 Merge "Allow the host expr." into qt-dev
am: a6957eeb1b

Change-Id: I46c0c63bcc6071ffea69acf49c882afce38ca90d
2019-05-03 17:13:02 -07:00
Colin Cross
7e793aa12b Merge "Support install-clean and data-clean"
am: 6ff39230e8

Change-Id: I1657ca7f833923b5c85a19546ed149a89a588e6e
2019-05-03 17:07:15 -07:00
dimitry
46becd866e Merge "Add native_bridge target to Android.bp" am: ec89e4c65c
am: 9da19e15ee

Change-Id: I49ecaa7fdb8bd283c9a8df00ddb6572bab9d140d
2019-05-03 16:47:46 -07:00
Treehugger Robot
6ff39230e8 Merge "Support install-clean and data-clean" 2019-05-03 23:38:40 +00:00
dimitry
9da19e15ee Merge "Add native_bridge target to Android.bp"
am: ec89e4c65c

Change-Id: I90803e4cac6fccdaaabc9d1ba3fb01491bb9bd65
2019-05-03 16:08:33 -07:00
Jaewoong Jung
acf18d7c63 uncompressedDex option for android_app_import.
This also partially consolidates shouldUncompressDex implementations.

Bug: 128610294
Test: TreeHugger
Change-Id: I7cea5a3890ddd473f63c0738a35af067455b5c4d
2019-05-03 15:58:41 -07:00
Jiyong Park
db98aa1c02 [automerger skipped] Merge "Emit LOCAL_MODULE_TARGET_ARCH for prebuilt_etc" into qt-dev
am: 92304882f4 -s ours
am skip reason: change_id Idd28443d129ff70053295015e69328a8fa3eca47 with SHA1 9aa3ab1f3f is in history

Change-Id: I7a9ff352773fa4f7c586aa10cd22b73d3eda8eca
2019-05-03 15:52:16 -07:00
Treehugger Robot
ec89e4c65c Merge "Add native_bridge target to Android.bp" 2019-05-03 22:23:00 +00:00
Colin Cross
806fd94bed Support install-clean and data-clean
Allow install-clean as an alias for installclean and data-clean as
an alias for dataclean.

Test: m install-clean
Change-Id: I9c97d60572a524ad68caecd26d52bfb987468075
2019-05-03 13:38:57 -07:00
Yi Kong
ef7790397f [automerger skipped] Strip libgcc to only keep fallback symbols
am: bd475367c3 -s ours
am skip reason: change_id I5b349fa6138e51663bf3b67109b880b4356da8e8 with SHA1 acee27cd72 is in history

Change-Id: I802924bf08962992030fe69fa1a3c8da47ee5101
2019-05-03 13:08:28 -07:00
Elliott Hughes
a9423b9b2e Merge "Allow the host expr." am: b0e7320fbc
am: aeb80db696

Change-Id: Ibba78748747b72576effea94510dd94498f8041b
2019-05-03 13:07:42 -07:00
TreeHugger Robot
a6957eeb1b Merge "Allow the host expr." into qt-dev 2019-05-03 20:03:07 +00:00
TreeHugger Robot
92304882f4 Merge "Emit LOCAL_MODULE_TARGET_ARCH for prebuilt_etc" into qt-dev 2019-05-03 19:33:21 +00:00
Elliott Hughes
aeb80db696 Merge "Allow the host expr."
am: b0e7320fbc

Change-Id: Iacdc734085ecff25235ea94d09018070f3d1da3a
2019-05-03 11:29:51 -07:00
Elliott Hughes
321dd2a411 Allow the host expr.
(Kernel builds require GNU unary + extension.)

Bug: https://issuetracker.google.com/131747477
Bug: http://b/35267372 (bogus)
Test: treehugger

(cherry picked from commit 3a653f419b)

Change-Id: Ia0a0d654d0ce30bb1e06bb789d52b311aa54b836
2019-05-03 17:29:10 +00:00
Elliott Hughes
b0e7320fbc Merge "Allow the host expr." 2019-05-03 17:24:00 +00:00
dimitry
1f33e40972 Add native_bridge target to Android.bp
This allows us to build guest libraries for the native bridge for
arm/arm64 architectures.

Bug: http://b/77159578
Test: make
Change-Id: I35520ca456105ddadd456c78a4eb1e6de39147c5
2019-05-03 15:33:28 +02:00
Yi Kong
bd475367c3 Strip libgcc to only keep fallback symbols
We use libgcc as fallback for symbols not present in libclang_rt
builtins, however we didn't know what exact symbols were being used,
some may not be intended to fallback.

Create libgcc_stripped, which only contains unwind symbols from libgcc.

Bug: 29275768
Test: bionic-unit-tests
Change-Id: I98df02ead7f6cca4e76ec92d4f880de4e03f5b5c
Merged-In: I5b349fa6138e51663bf3b67109b880b4356da8e8
(cherry picked from commit acee27cd72)
2019-05-03 08:24:10 +00:00
Yi Kong
b5624d7620 Merge "Strip libgcc to only keep fallback symbols" am: 940ef9bc89
am: 6e14640082

Change-Id: I7597fa6208f143555f04ddb300db1c3f26b4d853
2019-05-03 01:22:07 -07:00
Yi Kong
6e14640082 Merge "Strip libgcc to only keep fallback symbols"
am: 940ef9bc89

Change-Id: I98df02ead7f6cca4e76ec92d4f880de4e03f5b5c
2019-05-03 01:17:03 -07:00
Yi Kong
940ef9bc89 Merge "Strip libgcc to only keep fallback symbols" 2019-05-03 07:52:18 +00:00