Commit Graph

18402 Commits

Author SHA1 Message Date
Andreas Gampe
2114c5ab3f Build: Do not build sanitize-never executable
When LOCAL_SANITIZE := never is given for an executable, skip
building the binary in the ASAN build stage.

Bug: 117579123
Test: Build ASAN image with a never-sanitized executable
Change-Id: I6495fc857678ca9b46527c7d60ee71112004266d
2018-10-10 19:27:04 -07:00
Colin Cross
ef92a76397 Merge changes I6a4060a7,I7743fbda,I88eb24f8
am: ff999725ac

Change-Id: I32764651cc7669f4df1e8b26843d466f51c4cff6
2018-10-10 16:26:54 -07:00
Colin Cross
ff999725ac Merge changes I6a4060a7,I7743fbda,I88eb24f8
* changes:
  Unnest independent dexpreopt conditionals
  Indent dex_preopt_odex_install.mk
  Revert "Build: Do not treat org.apache.http.legacy.boot as boot classpath"
2018-10-10 22:35:49 +00:00
Po Hu
f513705f8f Merge "Initialize variable to fix wrong odex installed"
am: 471656df53

Change-Id: I6e1354f790d2f05dc6727195f1721d3927b09063
2018-10-10 13:30:11 -07:00
Treehugger Robot
471656df53 Merge "Initialize variable to fix wrong odex installed" 2018-10-10 20:06:32 +00:00
Colin Cross
c18757e34d Unnest independent dexpreopt conditionals
Most of the 6 nested conditionals are independent and can be
evaluated individually.  This has a slight change in behavior,
disabling preopt for a module in the product will now override
LOCAL_DEX_PREOPT, but that seems preferable.

Test: m
Change-Id: I6a4060a78df729c34bbf6978c84993859a947bf7
2018-10-10 10:12:03 -07:00
Vladimir Marko
de1467e7f3 Merge "Prebuild: Remove --compile-pic and -Xnorelocate."
am: c79539baca

Change-Id: I4ad7ef6562690294418eb4ecb4e2c2b2420a3087
2018-10-10 02:49:09 -07:00
Treehugger Robot
c79539baca Merge "Prebuild: Remove --compile-pic and -Xnorelocate." 2018-10-10 09:39:24 +00:00
Po Hu
eaef4d8b9f Initialize variable to fix wrong odex installed
When "PRODUCT_DEX_PREOPT_GENERATE_DM_FILES := true" and
"PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER := verify" are set,
boot jar may wrongly refer to previous module's variables such as
my_generate_dm, my_built_dm and my_installed_dm. And then cause
unexpected files installed along with this boot jar.

So initialize my_generate_dm to empty at first.

Bug: 117526952
Test: make out/target/product/generic/module-info.json
Test: cat out/target/product/generic/module-info.json | grep '"apache-xml":'
Change-Id: Iaa851f4fb530b3446de3dbcb1f54e545938830ce
2018-10-10 13:40:15 +08:00
Colin Cross
0a69bb6c90 Indent dex_preopt_odex_install.mk
Test: m checkbuild
Change-Id: I7743fbda98d1f1ea1d3e8242905239ff0115b6a9
2018-10-09 21:20:21 -07:00
Paul Duffin
cb846fa6f8 Revert "Build: Do not treat org.apache.http.legacy.boot as boot classpath"
This reverts commit 039bb48f72.

This is no longer needed. Depending on the setting of REMOVE_OAHL_FROM_BCP the org.apache.http.legacy library is now either on the bootclasspath or a standalone library, it cannot be both.

Bug: 18027885
Bug: 72167111
Change-Id: I88eb24f8a4324e206fd384cd8adf79acd6fc0858
Merged-In: I88eb24f8a4324e206fd384cd8adf79acd6fc0858
Test: make with and without REMOVE_OAHL_FROM_BCP=true
(cherry picked from commit 9390268746)
2018-10-09 21:19:25 -07:00
android-build-team Robot
2d3034c7c8 Make change and version bump to PQ2A.181009.001
Change-Id: I476c3fabbf6b436aac641f429a0fc8582268f04e
2018-10-10 03:16:26 +00:00
Colin Cross
4e04fff35e Merge "Remove extra JNI libs from prebuilt APKs"
am: 0443b46066

Change-Id: I5e0a657afcc61f7d7a7d19c2321b0654901274ca
2018-10-09 16:19:31 -07:00
Colin Cross
9cda85eb94 Merge "Add support for JNI libraries to soong_app_prebuilt.mk"
am: 9cb5cfad6d

Change-Id: I6ddadaf1b6e2445d9cf64316e9f2fa9cecf4a6e5
2018-10-09 15:52:12 -07:00
Treehugger Robot
0443b46066 Merge "Remove extra JNI libs from prebuilt APKs" 2018-10-09 22:35:26 +00:00
Treehugger Robot
9cb5cfad6d Merge "Add support for JNI libraries to soong_app_prebuilt.mk" 2018-10-09 21:50:40 +00:00
Colin Cross
0e8a2ee172 Remove extra JNI libs from prebuilt APKs
If an APK specifies LOCAL_PREBUILT_JNI_LIBS embedded in the prebuilt
APK, remove any that aren't listed.  Restores the behavior from before
I82dd3aa441712772a1d1ddd6aaf5f41179facaa7.

Bug: 69500920
Test: m checkbuild
Change-Id: I971a9c4206604c172d77144df4c0ed9a8b1c5dd0
2018-10-09 13:06:01 -07:00
Andreas Gampe
aa7650648f Merge "Change install paths of libs in sanitize builds"
am: 10b28befbe

Change-Id: I24ee93f44f9932d90e85d95bdedbdf1ecfddae29
2018-10-09 11:25:11 -07:00
Andreas Gampe
10b28befbe Merge "Change install paths of libs in sanitize builds" 2018-10-09 18:14:20 +00:00
Vladimir Marko
a332207767 Prebuild: Remove --compile-pic and -Xnorelocate.
The --compile-pic argument is obsolete, all generated code
is now PIC.

The -Xnorelocate is ignored by dex2oat since
    https://android-review.googlesource.com/771001
where the option was reinterpreted from "use patchoat if
needed" to "relocate the boot image in memory if possible"
and dex2oat forbids that relocation.

Test: Pixel 2 XL boots.
Bug: 77856493
Change-Id: I60cdf81267a129be8a482af26fb865110561268e
2018-10-09 17:35:07 +01:00
nelsonli
f52da96e11 Merge "Build System: Ignore copies in copy-many-files if src == dst"
am: 5112afe657

Change-Id: I48764170916be8ff5be985c16457ba3f09ce40d2
2018-10-09 03:34:12 -07:00
nelsonli
c91284dcd8 Build System: Ignore copies in copy-many-files if src == dst
BUG: 117224272

Test: 1. Modify build/core/base_rules.mk
         Add the following line after line 617
	  $(eval my_compat_dist_$(suite) += out/a:out/a))
      2. touch out/a
      3. make -j BluetoothInstrumentationTests
      4. It should build pass without any dependency errors.

Change-Id: I40372eab5b74e042f605c3cb38e72942531ed69a
2018-10-09 14:46:40 +08:00
Colin Cross
ce594b4549 Merge "Use zip2zip for uncompress-dexs and uncompress-shared-libs"
am: 0ab356ac20

Change-Id: Ia399045bb814afb3cea77af4d029f461b945aef7
2018-10-08 17:38:27 -07:00
Colin Cross
0ab356ac20 Merge "Use zip2zip for uncompress-dexs and uncompress-shared-libs" 2018-10-09 00:29:14 +00:00
Colin Cross
808af69564 Merge "Don't zip hiddenapi output jar into jar"
am: f05a023a5a

Change-Id: I11a335aaa98477fd3da9b1608d5ac83b45dafa87
2018-10-08 15:10:06 -07:00
Dan Willemsen
a7557afd71 Merge "Update for flags passed from Soong"
am: 159693a3e5

Change-Id: I5546acc1b6b88488a4bd088d106feea852c8026d
2018-10-08 15:05:55 -07:00
Colin Cross
f05a023a5a Merge "Don't zip hiddenapi output jar into jar" 2018-10-08 22:04:59 +00:00
Colin Cross
dac94fff8f Use zip2zip for uncompress-dexs and uncompress-shared-libs
Unzipping and rezipping files causes the umask of the host machine
to affect the permissions in the APK.  Use the new zip2zip -0 feature
to rewrite the zip file with selected files uncompressed.

Bug: 69500920
Test: m checkbuild
Change-Id: I82dd3aa441712772a1d1ddd6aaf5f41179facaa7
2018-10-08 12:49:11 -07:00
Colin Cross
c3c62fba96 Don't zip hiddenapi output jar into jar
Zip classes*.dex so that the jar does not contain an empty
classes.jar.

Test: m out/target/common/obj/JAVA_LIBRARIES/android.test.base.impl_intermediates/javalib.jar
Change-Id: I53bdd2035b2963dd781734da64058c95e1cff9d4
2018-10-08 11:23:59 -07:00
Dan Willemsen
7a5c5d730f Update for flags passed from Soong
Obsolete more GCC-specific flags, TARGET_(arm|thumb)_CFLAGS now contains
pre-filtered clang flags, and GLOBAL_CLANG_CFLAGS_NO_OVERRIDE now
contains all flags instead of just the clang additional flags.

Test: m
Change-Id: I068f155041e681068d38e1a5b6b04d354b85ccee
2018-10-07 19:43:23 -07:00
android-build-team Robot
5324fac321 Make change and version bump to PQ2A.181005.001
Change-Id: Iee13cdea66f0b0dc6185a32e6b79ac562f9bbec9
2018-10-06 03:16:55 +00:00
patricktu
3773dc822d Merge "aidegen: Collect all java sources from makefile system."
am: c18b2b28c2

Change-Id: I23f6091ee0df91f274394ecb34ecb002451514d1
2018-10-05 19:24:26 -07:00
android-build-team Robot
50f56547c8 Version bump to PQ1A.181105.017
Change-Id: I084629194e9d3f995e08e75c156d19730fa8b32f
2018-10-05 23:18:18 +00:00
patricktu
b23d8e6502 aidegen: Collect all java sources from makefile system.
Bug: 117129969
Test: make -j64 out/target/product/generic_x86_64/module-info.json
Change-Id: I4bc6cab8e56a1ed6485ad2f5f22fe9b8149b25d0
2018-10-05 14:55:36 +08:00
android-build-team Robot
8c3b437186 Version bump to PQ1A.181105.016
Change-Id: Ib8580ede65f721373b53b6050084cc871a9b7867
2018-10-05 00:39:56 +00:00
Yifan Hong
ecb1717422 Merge "Support "updatable groups"."
am: 3f0d1ad451

Change-Id: I704c56ff836e88f3a6c45a6869c9c111591860bc
2018-10-04 15:44:16 -07:00
Yifan Hong
3f0d1ad451 Merge "Support "updatable groups"." 2018-10-04 22:21:57 +00:00
Yifan Hong
b43012f0ad Support "updatable groups".
* BOARD_SUPER_PARTITION_GROUPS defines a list of "updatable groups". Each
updatable group is a group of partitions that share the same pool of free
spaces.

* For each group in BOARD_SUPER_PARTITION_GROUPS, a BOARD_{GROUP}_SIZE and
BOARD_{GROUP}_PARTITION_PARTITION_LIST may be defined.
    - BOARD_{GROUP}_SIZE: The maximum sum of sizes of all
      partitions in the group.
      If empty, no limit is enforced on the sum of sizes for this group.
    - BOARD_{GROUP}_PARTITION_PARTITION_LIST: the list of partitions that
      belongs to this group.
      If empty, no partitions belong to this group, and the sum of sizes is
      effectively 0.

* BOARD_SUPER_PARTITION_PARTITION_LIST should not be defined
by the device. It is now computed from all
BOARD_{GROUP}_PARTITION_PARTITION_LIST.

* Each 'updatable group' has its own pool of space for its
partitions to grow into. Enforce the following:
    * sum(all partitions) <= super partition (/ 2 for A/B)
    * For each group, sum(partitions in group) <= group size
    * sum(all group sizes) <= super partition (/ 2 for A/B)

Test: builds
Bug: 111610495
Change-Id: I072b011714ec31a1d8813cc75edd27da3c6ff39a
Merged-In: I072b011714ec31a1d8813cc75edd27da3c6ff39a
2018-10-04 13:08:56 -07:00
David Anderson
df6037fbf7 Merge "Remove uuidgen.py and update lpmake parameters."
am: d1428e2748

Change-Id: I3845a3818612d777e4a9ae95c2efddcb88233efd
2018-10-04 11:56:44 -07:00
Colin Cross
0fa751ba68 Add support for JNI libraries to soong_app_prebuilt.mk
Use install_jni_libs_internal.mk to install JNI libraries alongside
preinstalled APKs.  APKs with embedded JNI libraries are handled
within Soong.

Bug: 80095087
Test: m checkbuild
Change-Id: I2ecf10b6771dff14c940cc6e6442eb2ae43a75b0
2018-10-04 11:24:15 -07:00
David Anderson
d1428e2748 Merge "Remove uuidgen.py and update lpmake parameters." 2018-10-04 18:20:47 +00:00
Anton Hansson
21e7c05f7e Merge "Move a few more string functions to strings.mk"
am: d6e5cb1add

Change-Id: I20cf6bbef1c3aa05ea034ddd52e16fe2a9e87b1a
2018-10-04 07:03:28 -07:00
Anton Hansson
d6e5cb1add Merge "Move a few more string functions to strings.mk" 2018-10-04 13:47:55 +00:00
David Anderson
b954afec0b Remove uuidgen.py and update lpmake parameters.
Bug: 117229984
Test: device builds with PRODUCT_USE_LOGICAL_PARTITIONS=true
Change-Id: Ib39d19726861dd79d90923163f9e594ed91da4ca
2018-10-03 14:24:34 -07:00
Anton Hansson
9920578c25 Merge "Fix TWS requirement in definitions.mk"
am: ee08d635c7

Change-Id: I45983ac80720fa969f953b3a7ddd312f252eb85a
2018-10-03 08:56:54 -07:00
Anton Hansson
ee08d635c7 Merge "Fix TWS requirement in definitions.mk" 2018-10-03 15:41:22 +00:00
Anton Hansson
4967b34ddd Move a few more string functions to strings.mk
So they can be used in product.mk

Bug: 80410283
Test: make
Change-Id: Ic94754f6b48a3281ca1dd8c195a3410b543eb366
2018-10-03 15:59:39 +01:00
Anton Hansson
a0f91bd506 Fix TWS requirement in definitions.mk
Removing this TWS breaks the build. Add a backslash to avoid
needing it.

Test: make
Change-Id: I4f8e127218ffbf55a3e11600569f0100e914d2e2
2018-10-03 13:38:00 +01:00
Anton Hansson
7cf752a9dd Merge "Tidy up TARGET_COPY_OUT_X variable defs"
am: dd34185ae1

Change-Id: Ib15c863191e5a178d5b216b05f8aebfe21c30225
2018-10-03 02:09:44 -07:00
Anton Hansson
dd34185ae1 Merge "Tidy up TARGET_COPY_OUT_X variable defs" 2018-10-03 08:56:46 +00:00