Commit Graph

11894 Commits

Author SHA1 Message Date
Jaewoong Jung
9e47b0e136 Merge "Add Android.mk lines for package name overriding." am: ea66057a50 am: 9b3e4cc3af
am: afe716dcdb

Change-Id: I5074c6721c4d4d39e4fc5611621ac56318742722
2019-02-08 13:27:31 -08:00
Jaewoong Jung
afe716dcdb Merge "Add Android.mk lines for package name overriding." am: ea66057a50
am: 9b3e4cc3af

Change-Id: I7e78ebef525e27a1d1e92edbb75ce7152cac026e
2019-02-08 13:22:41 -08:00
Jaewoong Jung
9b3e4cc3af Merge "Add Android.mk lines for package name overriding."
am: ea66057a50

Change-Id: Ib321d7fbf6a1494a78f7c6763d21b14294c54a39
2019-02-08 13:17:16 -08:00
Jaewoong Jung
ea66057a50 Merge "Add Android.mk lines for package name overriding." 2019-02-08 21:00:27 +00:00
Jiyong Park
b32e622293 Merge "Handle the case when a symbol is annotated with "# apex vndk"" am: 3415780021 am: 11e6e5c76c
am: afdb54813e

Change-Id: Ic63b1ee87e9f3d958ea67945a517a2aba64a2b60
2019-02-08 11:05:39 -08:00
Jiyong Park
afdb54813e Merge "Handle the case when a symbol is annotated with "# apex vndk"" am: 3415780021
am: 11e6e5c76c

Change-Id: I91c072425b69efbc96b49235c3b4f7e7d3846218
2019-02-08 11:01:39 -08:00
Jiyong Park
11e6e5c76c Merge "Handle the case when a symbol is annotated with "# apex vndk""
am: 3415780021

Change-Id: I2567afe4afab0f9a71d87f3cafffb21f35fdf0a0
2019-02-08 10:57:34 -08:00
Treehugger Robot
3415780021 Merge "Handle the case when a symbol is annotated with "# apex vndk"" 2019-02-08 18:46:44 +00:00
Alex Light
815c4e92f8 Merge "Add support for test_apex" am: 39af6de6c1 am: 59a80fa75e
am: 1af41e318c

Change-Id: I48dc38a58db356b072f6dca40370c7017e70b8a0
2019-02-08 07:55:51 -08:00
Alex Light
1af41e318c Merge "Add support for test_apex" am: 39af6de6c1
am: 59a80fa75e

Change-Id: I4a8cc8f94b0c990075878817be127dd2e3678010
2019-02-08 07:51:33 -08:00
Alex Light
59a80fa75e Merge "Add support for test_apex"
am: 39af6de6c1

Change-Id: I048c0b6d5148a5ec6a28e4ac90cc886388625ce5
2019-02-08 07:46:34 -08:00
Alex Light
39af6de6c1 Merge "Add support for test_apex" 2019-02-08 15:38:24 +00:00
Jiyong Park
1431765f8d Handle the case when a symbol is annotated with "# apex vndk"
This change fixes a bug that a symbol is omitted for apex (or vndk) when
it is annotated with "# vndk apex" (or "# apex vndk).

Bug: 123349183
Test: python3 test_gen_stub_libs.py

Change-Id: I344d6e70732bae8877cb16bbe881edb79fe90670
2019-02-08 20:36:26 +09:00
Anton Hansson
18b30f9a4c Workaround dupe resource directories am: 129b9ceeb1 am: 2fc1d0f1ea
am: c8fa538ac0

Change-Id: I80de41497623113dd12cf65c41a8148a294109dc
2019-02-08 00:14:06 -08:00
Anton Hansson
c8fa538ac0 Workaround dupe resource directories am: 129b9ceeb1
am: 2fc1d0f1ea

Change-Id: I805e574de880122032b0fe4b1dc5148d6bf8dfb5
2019-02-08 00:10:03 -08:00
Anton Hansson
2fc1d0f1ea Workaround dupe resource directories
am: 129b9ceeb1

Change-Id: I5f685b76f379589f5964fc1c59c2597cfd44d3dc
2019-02-08 00:06:04 -08:00
Anton Hansson
129b9ceeb1 Workaround dupe resource directories
A few apps are co-located with libraries they depend on statically,
and because it's not possible to specify "no resource_dirs", they
both end up depending on the same resources, leading to downstream
problems for RRO generation.

Workaround the problem by de-duping the RRO paths for a single app
for now.

Bug: 124035856
Bug: 123510624
Test: make with enforce_rro == *
Change-Id: I251f123eb4280ed72e1ccd2212cb5f3e746e645d
2019-02-08 07:55:00 +00:00
Colin Cross
95f416cac8 Merge "Remove unused dexpreopt UseEmbeddedDex" am: 6ff48cd048 am: 98b1442180
am: ad7571f464

Change-Id: I3d77352678e4ae698583b5f8426b055f5c4a03fc
2019-02-07 23:39:38 -08:00
Colin Cross
ad7571f464 Merge "Remove unused dexpreopt UseEmbeddedDex" am: 6ff48cd048
am: 98b1442180

Change-Id: I3ba59551e0f3309aa824cddeaec7585e84ea390b
2019-02-07 23:35:24 -08:00
Colin Cross
98b1442180 Merge "Remove unused dexpreopt UseEmbeddedDex"
am: 6ff48cd048

Change-Id: I3275b61f6f16bcbe7d05c08d72a6f5df7afc8137
2019-02-07 23:30:47 -08:00
Treehugger Robot
6ff48cd048 Merge "Remove unused dexpreopt UseEmbeddedDex" 2019-02-08 07:19:33 +00:00
Colin Cross
45b69010c9 Merge "Make privileged java_library modules use uncompressed dex" am: 89ba9715ef am: 8367be9da7
am: 309ce85acd

Change-Id: I3e71ce5a2e84812bc61bd7e7051b34811027e092
2019-02-07 18:56:20 -08:00
Colin Cross
bbe7e8261e Merge "Allow disabling implicit resource_dirs and asset_dirs" am: 3e48a994e8 am: 73481a4cf6
am: d6fa3b1cbf

Change-Id: I64e113ce97c8d103a141ec65caacf67c08464b5f
2019-02-07 18:55:49 -08:00
Colin Cross
309ce85acd Merge "Make privileged java_library modules use uncompressed dex" am: 89ba9715ef
am: 8367be9da7

Change-Id: I18d0185aa672683f78591b603f5d74e805a50237
2019-02-07 18:48:06 -08:00
Colin Cross
d6fa3b1cbf Merge "Allow disabling implicit resource_dirs and asset_dirs" am: 3e48a994e8
am: 73481a4cf6

Change-Id: I316d86aa06561f1a17119347414efdff8fdb7730
2019-02-07 18:47:37 -08:00
Colin Cross
8367be9da7 Merge "Make privileged java_library modules use uncompressed dex"
am: 89ba9715ef

Change-Id: I8d6f5a8ada04691c56bc4dfe72157e640ac7ec7c
2019-02-07 18:39:12 -08:00
Colin Cross
73481a4cf6 Merge "Allow disabling implicit resource_dirs and asset_dirs"
am: 3e48a994e8

Change-Id: I36c78ef80aec36666dd8ea755ae298fa02398776
2019-02-07 18:38:41 -08:00
Colin Cross
89ba9715ef Merge "Make privileged java_library modules use uncompressed dex" 2019-02-08 02:29:59 +00:00
Colin Cross
3e48a994e8 Merge "Allow disabling implicit resource_dirs and asset_dirs" 2019-02-08 02:29:35 +00:00
Colin Cross
09a65ab6ca Remove unused dexpreopt UseEmbeddedDex
dexpreopt doesn't need to know about UseEmbeddedDex, it has
already been taken into account for UncompressedDex.

Test: m checkbuild
Change-Id: I5508aa43bb8bdb06e20cf93bc5171a5e78833983
2019-02-08 02:27:59 +00:00
Colin Cross
c8e819341d Remove the hiddenapi presingleton am: 697412f058 am: 3def9efe61
am: 57bda7a089

Change-Id: I59d0570d5aa1870abcbb7d9cda70a4171af0dfee
2019-02-07 18:21:58 -08:00
Colin Cross
32fd5947ca Make MakeVarsContext a PathContext am: 65494b962b am: e5bc0d6253
am: 1c15057b94

Change-Id: I3521fec124f35017812ed2c3faf9fb7e46f73a3a
2019-02-07 18:21:45 -08:00
Colin Cross
57bda7a089 Remove the hiddenapi presingleton am: 697412f058
am: 3def9efe61

Change-Id: I4d24fde1bacb98d103a79e555fbfa3d406173110
2019-02-07 18:04:34 -08:00
Colin Cross
1c15057b94 Make MakeVarsContext a PathContext am: 65494b962b
am: e5bc0d6253

Change-Id: I0c2daaefb69f8b9bcbb2e4a3ce68858d85e64baa
2019-02-07 18:04:19 -08:00
Colin Cross
3def9efe61 Remove the hiddenapi presingleton
am: 697412f058

Change-Id: I96f1dfed133081bd27c7658d196c2a6818ace8fc
2019-02-07 17:45:35 -08:00
Colin Cross
e5bc0d6253 Make MakeVarsContext a PathContext
am: 65494b962b

Change-Id: I1a2eab146c5f5327591c44faf224b562aac86610
2019-02-07 17:45:24 -08:00
Alex Light
0851b88eaf Add support for test_apex
Some test and other miscallaneous use-cases need apexs that are
installable but will not affect the installation of other artifacts
onto the device. For this purpose we added a test_apex type. These
test_apex targets create apex files and have all the normal attributes
but are not considered the source of any of their contents for the
device by the rest of the build-system.

Test: build and boot
Test: ALLOW_MISSING_DEPENDENCIES=true \
      DIST_DIR=$ANDROID_BUILD_TOP/out/dist \
      ./art/tools/dist_linux_bionic.sh -j72 showcommands com.android.runtime.host
Bug: 123591866
Bug: 123892969

Change-Id: I7f50be0ac0425cd87868145e18bcee6962d472ef
2019-02-07 16:52:20 -08:00
Colin Cross
0ddae7fddd Allow disabling implicit resource_dirs and asset_dirs
Specifying [] for resource_dirs or asset_dirs will prevent using
the default "res" or "assets" directories.

Test: TestResourceDirs
Bug: 124035856
Change-Id: I96e38ac1319260db43950299a8b1774da68ea85e
2019-02-08 00:24:01 +00:00
Colin Cross
697412f058 Remove the hiddenapi presingleton
The presingleton is no longer necessary now that MakeVarsContext
is a PathContext, just call hiddenAPISingletonPaths directly.

Test: m checkbuild
Test: forrest build of unbundled branch
2019-02-07 22:31:44 +00:00
Colin Cross
65494b962b Make MakeVarsContext a PathContext
Expose all of SingletonContext to makeVarsContext, and then export
the subset of it that is used through MakeVarsContext.SingletonContext,
plus what is necessary for PathContext, directly through
MakeVarsContext.

Test: m checkbuild
Change-Id: Ie00f36e577fe110b6fa03b901da489d8547773c6
2019-02-07 22:31:04 +00:00
Aurimas Liutikas
b74157dfb3 Merge "Update NDK library list" am: 7cf14099b7 am: aa6f7adb24
am: 812dde86dd

Change-Id: I0e03ab3ce27746fcc362c2773a81b96370b8d8a7
2019-02-07 13:05:20 -08:00
Aurimas Liutikas
812dde86dd Merge "Update NDK library list" am: 7cf14099b7
am: aa6f7adb24

Change-Id: Ibe65dc99dde67305087b6410715a40bc52bd6c55
2019-02-07 13:01:16 -08:00
Aurimas Liutikas
aa6f7adb24 Merge "Update NDK library list"
am: 7cf14099b7

Change-Id: I2963a3359f1e20f67990ba0473340ad70bbcecbe
2019-02-07 12:57:13 -08:00
Sasha Smundak
6eefaa8181 Provide an option to reduce build's verbosity. am: c0c9ef9964 am: 01531b48a0
am: 4eff8bbebf

Change-Id: I76aa988987f8875440b4151db6862e18f6c47cd9
2019-02-07 12:50:14 -08:00
Aurimas Liutikas
7cf14099b7 Merge "Update NDK library list" 2019-02-07 20:46:46 +00:00
Sasha Smundak
4eff8bbebf Provide an option to reduce build's verbosity. am: c0c9ef9964
am: 01531b48a0

Change-Id: I3859445a95109c9df2aa2d7d0e42305a1eeb3d36
2019-02-07 12:45:11 -08:00
Sasha Smundak
01531b48a0 Provide an option to reduce build's verbosity.
am: c0c9ef9964

Change-Id: I7ae0b4a7b1a1fc20ff4c7e71b9e9c7c4db5728a3
2019-02-07 12:41:26 -08:00
Sasha Smundak
c0c9ef9964 Provide an option to reduce build's verbosity.
If ANDROID_QUIET_BUILD environment variable is set to '1', do not show 20
lines of the environment variables. In addition, for the failing step show
only the step name and output, omitting the command proper (the verbose log
as well as error.log still contains it).
If build succeeds, the output of the build itself consists of a single
line:
```
> m androidmk
[100% NN/NN] <last command>
```

When it fails, the output does not contain sometimes very long command
line:
```
> m androidmk
[ 97% NN/MM] test androidmk
FAILED: <step>
--- FAIL: TestEndToEnd (0.01s)
    androidmk_test.go:1025: failed testcase 'prebuilt_etc_TARGET_OUT_ETC'
        input:
        include $(CLEAR_VARS)
        LOCAL_MODULE := etc.test1
        LOCAL_MODULE_CLASS := ETC
        LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/foo/bar
        include $(BUILD_PREBUILT)

        expected:
        prebuilt_etc {
            name: "etc.test1",
            filename: "foo/bar",
        }

        got:
        prebuilt_etc {
            name: "etc.test1",
            filename: "foo/bar",

        }

FAIL
17:50:53 ninja failed with: exit status 1
```
[The related change in build/make/envsetup.sh suppresses timing display
when the same variable is set.]

Change-Id: I4d3c72457de031ff58a324c2fe98f4c1d10f8239
Test: treehugger
2019-02-07 12:21:45 -08:00
Colin Cross
c73f63616d Merge "Use a presingleton to create hiddenapi singleton paths early" am: 17c85f098a am: a0e1404cf9
am: 9e43bcb7ec

Change-Id: Ib66c4ee3a11666539a1e0aa44422636549e30777
2019-02-07 12:18:09 -08:00
Colin Cross
9e43bcb7ec Merge "Use a presingleton to create hiddenapi singleton paths early" am: 17c85f098a
am: a0e1404cf9

Change-Id: I59970ce9b09d16b24b3f68c9741cae4a18f1e9a6
2019-02-07 12:15:06 -08:00