Commit Graph

335 Commits

Author SHA1 Message Date
Victor Chang c3538a4ac0 Remove libicu*.so from /system
Bug: 120659668
Test: CtsJniTestCases
Merged-In: I1c2ab41aa0b19f71025e2dd09be9b9bd306e8616
Change-Id: I1c2ab41aa0b19f71025e2dd09be9b9bd306e8616
(cherry picked from commit c164b8ef13)
2019-04-15 12:36:50 +01:00
vichang 9def1f23e9 Merge "Remove libicu*.so from /system" am: b23062899c
am: 5a7ce27b9f

Change-Id: Ifdaa72481889fe37e751e355b906e99eef2029c0
2019-04-13 02:46:46 -07:00
Victor Chang c164b8ef13 Remove libicu*.so from /system
Bug: 120659668
Test: CtsJniTestCases
Change-Id: I1c2ab41aa0b19f71025e2dd09be9b9bd306e8616
2019-04-12 20:01:43 +01:00
Yifan Hong 0d8e89b5f8 Reland "Only assert-max-image-size for static partitions."
assert-max-image-size doesn't make sense for
dynamic partitions, as build_image.py always find the
right size for the output image. Hence:

- build_image.py no longer need to write generated_*_info.txt
  (which contains the size of the image).
- assert-max-image-size on the static BOARD_*IMAGE_PARTITION_SIZE. If
  a partition is dynamic, that variable isn't set, and
  assert-max-image-size becomes a no-op. If the partition is static,
  assert-max-image-size checks the static partition size as it used
  to be.
- Fix read-size-of-partitions to use the size of the partition by
  reading the image directly (instead of using generated_*_info.txt).

For devices without AVB, with DAP enabled, and does not have
RESERVED_SIZE for partitions, because of right sizing, the original
code always warns about approaching size limits. Since such checks
doesn't make sense for dynamic partitions, remove them.

Test: builds on device with dynamic partitions
Test: builds on cuttlefish with DAP enabled (without AVB), no
      more size limit warnings:
WARNING: out/target/product/vsoc_x86/vendor.img approaching size limit (X now; limit X)

This reverts commit 6e099095d1.

Reason for revert: reland the CL

Bug: 122377935
Test: build blueline_mainline

Change-Id: Iee594b64e687decff186c0fa60f82b88608febe9
Merged-In: Iee594b64e687decff186c0fa60f82b88608febe9
2019-04-11 10:12:27 -07:00
Yifan Hong f15b77cfe7 Merge "Reland "Only assert-max-image-size for static partitions."" am: d72873dc41
am: d70f1c637a

Change-Id: I204a6cdeee52ebd8643a223f8bb6f312037d159a
2019-04-10 13:48:34 -07:00
Yifan Hong 8c3dce0c56 Reland "Only assert-max-image-size for static partitions."
This reverts commit 6e099095d1.

Reason for revert: reland the CL

Bug: 122377935
Test: build blueline_mainline

Change-Id: Iee594b64e687decff186c0fa60f82b88608febe9
2019-04-09 10:56:34 -07:00
Florian Mayer a1bfa46cfa Merge "Revert "Only assert-max-image-size for static partitions."" am: 1d26ca95c3
am: 3db0c17630

Change-Id: I5fb9b3f57d7e86fc5644dd059986082ecb382612
2019-04-09 07:20:48 -07:00
Florian Mayer 6e099095d1 Revert "Only assert-max-image-size for static partitions."
This reverts commit 67e4336912.

Reason for revert: Broke master

Change-Id: I8a5054a42f145881437e2cb5b372f276bfdaa3d2
2019-04-09 09:54:59 +00:00
Yifan Hong 201daffa9a Merge changes from topic "dap_size_check" am: 3c4889fc79
am: 27128f4b10

Change-Id: I3bdebdef8a8bcef7c841967ff9562342ed33a60c
2019-04-08 22:19:03 -07:00
Yifan Hong 67e4336912 Only assert-max-image-size for static partitions.
assert-max-image-size doesn't make sense for
dynamic partitions, as build_image.py always find the
right size for the output image. Hence:

- build_image.py no longer need to write generated_*_info.txt
  (which contains the size of the image).
- assert-max-image-size on the static BOARD_*IMAGE_PARTITION_SIZE. If
  a partition is dynamic, that variable isn't set, and
  assert-max-image-size becomes a no-op. If the partition is static,
  assert-max-image-size checks the static partition size as it used
  to be.
- Fix read-size-of-partitions to use the size of the partition by
  reading the image directly (instead of using generated_*_info.txt).

For devices without AVB, with DAP enabled, and does not have
RESERVED_SIZE for partitions, because of right sizing, the original
code always warns about approaching size limits. Since such checks
doesn't make sense for dynamic partitions, remove them.

Test: builds on device with dynamic partitions
Test: builds on cuttlefish with DAP enabled (without AVB), no
      more size limit warnings:
WARNING: out/target/product/vsoc_x86/vendor.img approaching size limit (X now; limit X)

Fixes: 122377935
Change-Id: I75e1b8322197cb18cf397d02aefd49d777bb6405
2019-04-04 15:09:51 -07:00
Yifan Hong 7a8ffbeb9f resolve merge conflicts of 7bd8a3692f to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I16278376fb4a2b26f15b675016d00819ea99c296
2019-04-01 09:53:23 -07:00
Yifan Hong 5478754cd6 Move super.img to obj/PACKAGING
To avoid the confusion. super.img isn't intended to be flashed
during day-to-day development.

Test: m superimage
Bug: 128891161
Change-Id: I9d62e5929b415343b2d890ab21e6ae51175af2ae
2019-03-29 14:47:28 -07:00
Jiwen 'Steve' Cai eee1046b50 Remove android.frameworks.bufferhub@1.0-service
Disable this for Q. We will add this back once Q branches.

Bug: 128320950
Bug: 123429755
Test: Build system
Change-Id: I1d360c7a8890148be6197092ba149203a72a019d
2019-03-29 11:51:42 -07:00
Bowgo Tsai e4544b1c02 Moving system_other key into product.img
Currently system_other AVB public key is placed in system.img.
However, this makes it's harder to have a *generic* system.img
across different product configs. Moving the key to /product
partition to allow more product-specific AVB keys.

Device board config can add /product/etc/fstab.postinstall,
to mount system_other with this key in /product. It can specify
different mount options, file systems, verity settings, etc., in
this product-specific fstab as well.

Bug: 123611926
Test: `make productimage` checks the following is generated.
      $OUT/product/etc/security/avb/system_other.avbpubkey
      Also checks it's included in $OUT/installed-files-product.{json, txt}

Test: run the following command and checks that
      PRODUCT/etc/security/avb/system_other.avbpubkey is updated:
      ./build/tools/releasetools/sign_target_files_apks \
        --avb_system_other_algorithm SHA256_RSA2048 \
        --avb_system_other_key external/avb/test/data/testkey_rsa2048.pem \
        out/dist/*-target_files-*.zip signed-target_files.zip

Change-Id: I6804f29941bec54375d80bd68a5aedb5c23b842e
2019-03-20 16:18:11 +08:00
Nelson Li 1f8357fe7d Revert "Revert "Build System: Solve dependency problem for test""
This reverts commit 6fe7f194b9.

Reason for revert: Fixed all build break.

Change-Id: I0a4842df1225399752515a4cd7a7c14173a5bf7b
2019-03-14 01:05:36 +00:00
Nelson Li 6fe7f194b9 Revert "Build System: Solve dependency problem for test"
This reverts commit 224e103308.

Reason for revert: Build Breakage in git_pi-dev-plus-aosp/docs @5366136
make -j110 docs showcommands dist DIST_DIR=/buildbot/dist_dirs/git_pi-dev-plus-aosp-linux-docs/5366136 checkbuild
FAILED:
 Dependencies in out found with no rule to create them:
 out/target/product/generic/data/app/CtsVerifierTester/CtsVerifierTester.apk
 out/target/product/generic/data/app/TradeFedTestApp/TradeFedTestApp.apk
 out/target/product/generic/data/app/TradeFedUiTestApp/TradeFedUiTestApp.apk
 15:53:46 stopping
and
make -j50 showcommands dist TARGET_PRODUCT=cf_x86_phone DIST_DIR=/buildbot/dist_dirs/git_master-linux-ndk_translation_all/5366149 ndk_translation_all
FAILED: ninja: 'out/target/product/vsoc_x86/data/nativetest/arm/arm_insn_tests_arm_static/arm_insn_tests_arm_static', needed by 'out/target/product/vsoc_x86/obj/PACKAGING/ndk_translation_tests_intermediates/arm_insn_tests_arm_static_result.xml', missing and no known rule to make it
15:55:38 ninja failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: Idf95ef2e06526a0a31690420c923207db627605f
2019-03-11 16:48:29 +00:00
nelsonli 224e103308 Build System: Solve dependency problem for test
1. A test can add a runtime dependent test module by just setting
   LOCAL_REQUIRED_MODULES or LOCAL_TARGET_REQUIRED_MODULES. Then the dependent test
   module will be copied to testcase folder.
2. Do not install to $(TARGET_OUT_DATA) for testcase

BUG: 117224272

Test: 1. (a) vi cts/tests/tests/text/Android.mk
         (b) add LOCAL_REQUIRED_MODULES := CtsPrintTestCases
         (c) m -j CtsTextTestCases
         (d) Then, CtsPrintTestCases should also be built to testcase folder like below.
             ./target/product/generic_arm64/testcases/CtsPrintTestCases

Change-Id: I24ea3783486c54a05cfa9d3d0375b977afc230f8
2019-03-07 14:08:35 +08:00
Martin Stjernholm 6fd16926b1 Clean up libjdwp.so and possibly other dependencies that might have crept in
between http://r.android.com/890494 and http://r.android.com/913898.

(Repopulating libs from intermediates is quick, so not wasting effort trying
to be precise.)

Test: Don't have a suitably old build tree to test with.
Bug: 124498388
Change-Id: Ice35606e4c301d5b01837963137421f9d23a9733
2019-03-01 20:41:52 +00:00
Martin Stjernholm 616dc79043 Remove libnpt from system again.
http://r.android.com/914573 fixes libjdwp to look for it in the APEX.

Test: Flash and boot
Test: adb forward tcp:5555 jdwp:`adb shell pidof com.android.email` && jdb -attach localhost:5555
Test: atest CtsJdwpTestCases
Bug: 124498388
Change-Id: Idf380660a21c88969e42d6a03a6b50fd2baa4c17
2019-02-27 20:51:56 +00:00
Colin Cross 47e384c3d6 Remove dexpreopting of boot jars from Make
Dexpreopting of boot jars is now implemented in
build/soong/java/dexpreopt_bootjars.go.

Test: m checkbuild
Change-Id: I036510e7674b876976ce191c5b18bf0b7a15c6ee
2019-02-15 13:00:14 -08:00
Martin Stjernholm a568592f53 Disable installation of ART modules in /system.
Remove ART modules (`art-runtime`, `art-tools`) from `PRODUCT_PACKAGES`, as
they are provided by the Android Runtime APEX module
(`com.android.runtime`).

Copy of rpl's http://r.android.com/812674.

Test: Flash and boot
Test: atest CtsJniTestCases
Test: atest CtsJdwpTestCases
Test: m checkbuild dist
Bug: 113373927
Change-Id: I3e0c130f1a9c596629ab243648f0251cf71c1499
2019-02-13 22:28:09 +00:00
Anton Hansson 95958eefa9 Change RRO default location to /product
This changes the default location of RRO packages that don't
specify where they should be installed to /product instead of
/vendor.

Also change the auto-generated "enforced RRO" packages to install
on /product, and be explicit about that in the mk to make it
independent of the RRO default.

The reasoning for this change is that most overlays tend to be
for product level customizations, like themes and so on. RROs
for hardware related things can still be explicitly installed
on /vendor.

Bug: 123566903
Test: preubmit
Test: various internal tests
Change-Id: Ie7d5f19dc7ab421a7bcf584153f991e18e961cda
2019-02-07 13:06:18 +00:00
Colin Cross 485c9cd400 Move hiddenapi singleton rules to Soong
Hiddenapi rules are now in build/soong/java/hiddenapi_singleton.go.
This effectively requires any module in PRODUCT_BOOT_JARS to be
defined in Soong.

Bug: 123645297
Test: m checkbuild
Change-Id: If72bd1c20b2014d0a3d400624d37fdb0a3052245
2019-02-05 21:38:55 -08:00
Anton Hansson 80c80804f0 Merge product_services into product by default
Noone is intended to use product_services for now, so make
product_services modules merge in product by default.

Bug: 113098451
Test: boot blueline
Test: boot walleye
Change-Id: Id13487e40afe4ae581fac027c8c075798c26c7e8
2019-02-01 15:04:44 +00:00
Pete Bentley b8b08bdd02 Move remaining libcore JNI libraries to APEX.
Test: Flash and boot on Taimen
Test: atest CtsLibcoreTestCases CtsJniTestCases
Bug: 119090773
Change-Id: Ia9e7077327d2abc3f637c09acc5933b9c1682d5a
Exempt-From-Owner-Approval: Simple clean steps rule
2019-01-28 09:14:12 +00:00
Dan Willemsen 45539e3941 Fix possible incremental build issue
We tried to start using toybox's sed, but it produced invalid results
with one of init's genrules. Clear out that generated code to fix future
incremental builds, since we don't rebuild everything on a $PATH change.

Bug: 122744241
Test: generate bad file, remove toybox sed, apply this change
Change-Id: I197aa4b68b2fe309b3033e8736e1d80c8ded80ad
2019-01-11 19:51:06 -08:00
Justin Klaassen 6900aa2144 Remove ExactCalculator module
Individual products can add their own calculator package if desired.

Bug: 120905067
Test: lunch aosp_arm64 && make -j8
Merged-In: I60490b6e2a42c4304768075e8fef9f07cb72d268
Change-Id: I60490b6e2a42c4304768075e8fef9f07cb72d268
2019-01-10 14:30:55 +08:00
Colin Cross ab84792815 Remove file named .d created in the source directory
I59b20c931ee3e5a8d35eb30da4148691c5095502 accidentally wrote depsfiles
to a file called .d in the top level of the source tree, remove them.

Bug: 119412419
Test: m
Change-Id: Iaf71a64a7ee4aa39084423dfd16aa934613ba158
2018-12-15 19:13:29 -08:00
Colin Cross e07a32b124 Restore reverted CleanSpec
Ica006a007d112c232311435aaac0c0e476232b67 added a clean step that was
reverted in I0ce3ad70c73ff997aacaf411b0b5dc73760e7f91.  Reverting
a clean step could cause a future clean step to be skipped, because
Make only tracks how many clean steps have been run out of each
CleanSpec.mk file.  Add back the reverted clean step.

Bug: 119412419
Test: none
Change-Id: I11fe12d7c3526ccc21f468b350b4288cb55a9447
2018-12-15 19:05:07 -08:00
Colin Cross 10846f99fb Revert "Correctly create directories before unzipping dexpreopt zip"
This reverts commit 2bb1f518fd.

Test: none
Bug: 119412419
2018-12-14 11:49:55 -08:00
Colin Cross 2bb1f518fd Correctly create directories before unzipping dexpreopt zip
Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 attempted to pre-create
the directories that unzip would unzip into, but incorrectly
created them in the top of the source tree instead of in
$(PRODUCT_OUT).  Fix the directory location and add a cleanspec
to clean up the incorrect directories in the source tree.

Bug: 119412419
Test: m correctly cleans up incorrect directories in source tree
Test: extract unzip command from out/verbose.log.gz and add bash -x
Change-Id: Ica006a007d112c232311435aaac0c0e476232b67
2018-12-13 23:32:06 -08:00
Nicolas Geoffray 1bc5aff793 Remove perfprofd from set of binaries installed on system.
Needed to get some space on marlin-eng :(

Also avoids static linking libart into perfprofd. Roland will follow-up by reverting the no-perfprofd changes.

bug: 73175642

Test: lunch marlin-eng && m -j32
Change-Id: Ic1c79c6dd1052981801b92604f9891a8a63b4ea0
2018-12-11 23:00:57 +00:00
patricktu 345c9ae44f AIDEGen: Adopt prebuilt mechanism to bypass 'm aidegen'.
Bug: 119642842
Test: m clean;aidegen tradefed
Change-Id: Ib25591de77762ffdcc72ea4a064a50cfb3e5015e
2018-11-29 15:25:40 +08:00
Anton Hansson adbafe0a7c Add BOARD_USES_SYSTEM_OTHER_ODEX := true to mainline
Likely not the final setting we'll settle with for this device,
but brings mainline_system builds closer to the device builds
it's targeting.

Bug: 80410283
Test: build mainline_arm64
Change-Id: Ib672d1a060d0ad6a4e1faa210461bbbbaf6f2bc6
2018-11-16 16:36:50 +00:00
Colin Cross 3b4417a45e Remove old copies of host-libprotobuf-java-full.jar in test suites
Test suite directories not covered by installclean have an old copy
of host-libprotobuf-java-full in them that causes problems when
libprotobuf-java-full uses an updated ABI, remove them.

Bug: 119049592
Test: manual
Change-Id: Iedf0aaf2a1d1ca2c7332da3cc6d948946946eebe
2018-11-05 15:11:46 -08:00
Dan Willemsen 78c40be560 Create a new kati packaging step; move dist
Instead of looking at `dist` and DIST_DIR directly in the Kati Build
step, always write out information about every call to dist, then create
the rules in another ckati run.

So instead of having:

  dist:    <goal> -> <dist> -> <output>
                \______________↑

  nodist:  <goal> -----------> <output>

Always use another phony target in the Kati Build step:

   <goal> ---> <output>
        \----> _dist_<goal>

Then in the packaging step (which is much faster), choose between dist
and no dist:

  dist:   _dist_<goal> -> <dist> -> <output>

  nodist: _dist_<goal>

Bug: 117463001
Test: m dist
Change-Id: Ic96bb6356740300dd3113f6ed699e6a619360c40
2018-10-20 21:44:44 +00:00
Colin Cross 3c6d5480c5 Remove strip.sh intermediates to save space
Add a cleanspec to removed unused strip.sh intermediates.  Saved
32GB on my AOSP checkout that had been used to build multiple
devices.

Test: m nothing
Change-Id: Ia319a2feacdd1a1ac8b88a6783766c370438ce12
2018-10-18 14:19:56 -07:00
Dan Willemsen 8cf6b65445 Remove *_OUT_INTERMEDIATE_LIBRARIES
Always use the exact libraries like Soong does instead.

Test: m
Change-Id: Ifd48020073dd045247f76f84627c497e94562286
2018-09-15 10:52:13 -07:00
Tao Bao 696bb33676 Install recovery etc files to recovery/root/system/etc.
They used to be installed under recovery/root/etc. This CL moves the
files to the new location and creates a symlink from /etc to /system/etc
(done by the rule in system/core/rootdir). This gives similar layout
between normal boot and recovery, and allows installing prebuilt_etc
files with Soong (`recovery_available: true`).

As part of the change, we no longer need the whitelisting rule for
mke2fs.conf.

Bug: 112780007
Test: Build with other changes in the topic (aosp_taimen-userdebug).
      Check the generated files under recovery (/etc being a symlink to
      /system/etc).
Test: Boot into recovery. Verify basic functionalities (`adb shell` and
      `adb sideload`, factory reset).
Test: `build/soong/build_test.bash --dist`
Change-Id: Ibb6dea6f179a339f0c2d0fd8ba05ec0085b79a12
2018-08-21 10:30:49 -07:00
Tao Bao d6b3a4cc79 Add the Cleanspec rule for product-services symlink.
Bug: 112431447
Test: `m dist` when there's a leftover symlink of "/product-services".
Change-Id: I39bb79bd7790fe2243075768c6423b0fddc379f7
2018-08-21 07:34:18 -07:00
Dario Freni 924af7d4dd s/product-services/product_services/g
Attempting to reduce the number of different spellings we have for
"product services" partition in the codebase.

Bug: 112431447
Test: m
Change-Id: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
Merged-In: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
2018-08-20 10:44:59 -07:00
Sudheer Shanka a566dce20b Update CleanSpec to remove generated files from IVold.aidl.
Bug: 112058806
Test: Device booted after flashing a build with this change.
Change-Id: If0bda6869a7ed09b8c320b5c44c43f9d4cb4c3dd
Merged-In: If0bda6869a7ed09b8c320b5c44c43f9d4cb4c3dd
2018-08-20 10:44:50 -07:00
Steven Moreland 91c5154a42 Remove vr_hwc from GSI image.
Not all phones support the VR, so on phones
that don't, the inclusion of vr_hwc is causing
VtsHalGraphicsComposerV2_1Target failures.

Bug: 109913118
Bug: 111963599
Test: vr_hwc is not on aosp_arm64_ab
Change-Id: I803b4dddc5a87e35875992ad9421c644698112f1
Merged-In: I803b4dddc5a87e35875992ad9421c644698112f1
(cherry picked from commit 52971ca09b)
2018-07-31 02:48:29 +00:00
Colin Cross c7dee5c9a1 Move merged AndroidManifest.xml file to manifest subdirectory
Some modules generate their own custom AndroidManifest.xml file
to $(intermediates.COMMON)/AndroidManifest.xml file.  Move the
build system's location to
$(intermediates.COMMON)/manifest/AndroidManifest.xml.

This location will also be used later for finding manifest files
from LOCAL_STATIC_ANDROID_LIBRARIES dependencies.

Bug: 78447299
Test: m checkbuild
Change-Id: I345f079bdd191451333b38d882418f2f7150b1e9
Merged-In: I345f079bdd191451333b38d882418f2f7150b1e9
(cherry picked from commit 0bcc120b54)
2018-06-14 21:36:53 +00:00
Sunny Goyal 47acd31f57 Changing the default launcher and recents implementation for system build
Bug: 77490347
Test: Build and flashed system image
Change-Id: I71dbd7eb731c70656bb816848027626b2c7430cc
2018-06-05 21:15:06 +00:00
Logan Chien d73b94c097 Build a single GSI for O-MR1-VENDOR and Master-VENDOR
The objective of this commit is to support these 3 combinations:

1. Master-GSI + Master-VENDOR (w/ BOARD_VNDK_VERSION)
2. Master-GSI + Master-VENDOR (w/o BOARD_VNDK_VERSION for upgrading devices)
3. Master-GSI + O-MR1-VENDOR (w/ BOARD_VNDK_VERSION)

This commit defines a new property `ro.vndk.lite` to indicate the status
of BOARD_VNDK_VERSION run-time enforcement.  Now, all devices should
have `ro.vndk.version` so that `libhidlbase.so`, `libRSCpuRef.so`, and
`libnativeloader.so` can find the versioned VNDK directory.

Bug: 78605339
Test: aosp_sailfish Master-SYSTEM + Master-VENDOR boots
Test: aosp_sailfish Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-SYSTEM + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + Master-VENDOR boots
Test: aosp_walleye  Master-GSI    + O-MR1-VENDOR boots
Change-Id: Iee9553b3ca9e0798a873e655d87d10cdc23d4b1c
2018-05-10 21:17:58 +08:00
Colin Cross 50e8751056 Add asan-specific CleanSpec
ASAN builds run as two consecutive builds.  The cleanspec is applied by
the first one, which cleans the obj directory, and ignored by the
second.  This can result in old entries in the obj_asan directory.

Bug: 73885582
Test: obj_asan dirs are deleted
Change-Id: I54b8ec9cff581fcd9ec2a843aa7126805340c387
Merged-In: I54b8ec9cff581fcd9ec2a843aa7126805340c387
(cherry picked from commit 4e2da3277a)
2018-03-20 15:48:03 -07:00
Colin Cross ccf8992ac2 Use a srcjar for aapt and aapt2 output
Dumping files in the *_intermediates/src causes incremental build
problems, because we don't know when to delete them if they are
no longer generated.  Switch to outputting a srcjar instead, and
pass it in to the turbine and javac compiles.

Bug: 73885582
Test: m checkbuild
Change-Id: Ibef28507522339d930c09426d0c98372eb864cb6
Merged-In: Ibef28507522339d930c09426d0c98372eb864cb6
(cherry picked from commit 2d1cddd567)
2018-03-20 15:47:45 -07:00
Colin Cross ec7be103d0 Use srcjar and resource zip as output of renderscript rules
Replace RenderScript.stamp with a srcjar, with a resource zip as
an implicit output.  This makes the renderscript rules self contained,
which will make it easier to move them before aapt.

Bug: 73885582
Test: m checkbuild
Change-Id: I12d33e52019aebac6ea33271939228e4690a4173
Merged-In: I12d33e52019aebac6ea33271939228e4690a4173
(cherry picked from commit e00e2fae52)
2018-03-20 15:47:45 -07:00
Adrian Roos 12f3d9e2be Multi cutout: replace narrow with corner overlay
Bug: 74982138
Test: make droid
Change-Id: Ia6b25a0cf3718d316f944b7abf44fe9711fa0cf5
2018-03-15 19:23:05 +00:00
Adrian Roos 17444d16c2 Multi cutout: replace wide with double overlay
Bug: 74195186
Test: make droid
Change-Id: I4758ed081a0e306f87db21c9bc2c8160c455a0e6
2018-03-13 13:45:23 +01:00
Yifan Hong 8f863693c9 move VINTF metadata to /etc/vintf/ .
In particular,
/vendor/manifest.xml => /vendor/etc/vintf/manifest.xml
/system/manifest.xml => /system/etc/vintf/manifest.xml
/vendor/compatibility_matrix.xml =>
    /vendor/etc/vintf/compatibility_matrix.xml

Test: verify that fileis exist in destination
Test: hwservicemanager can read these files
Bug: 36790901
Change-Id: Ic361a48e170fb9a77faec76ad0e829625427820d
2018-01-19 10:52:27 -08:00
Colin Cross a6e878219c Remove obsolete leaf names
classes-no-debug-var.jar is incorrect, jars in coverage builds
do have debug information.  Remove full_classes_compiled_jar_leaf
and hardcode classes-full-debug.jar.

After the previous patch, all dex files have debug information,
so remove the no-local and with-local directories and replace
them with dex/.

Remove the unnecessary jarjar_leaf.

Bug: 70886092
Test: m checkbuild
Change-Id: I63eace8f8cda5ad8bc0cbd11eefda73dd063ed76
2017-12-20 17:33:01 -08:00
Justin Yun 2a233b3b86 Define PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".

Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
2017-12-13 10:48:34 +09:00
Colin Cross d5cce4c360 Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS
PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS are only used to pass
--pseudo-localize.  The flag doesn't need to be conditional on the
product, because the pseudo locale will be stripped out later if it
is not wanted.  Having it conditional on the product causes the
AAPT2-compiled resources to vary between products, which causes
unnecessary rebuilds when swithcing products.

Remove the variables, always add --pseudo-localize, and move
the AAPT2 compiled output to the common intermediates.

Test: m checkbuild
Change-Id: Iacc914114616b5bd19d9a1011802f4f9bca9bc19
2017-10-27 16:25:55 -07:00
Dan Willemsen 4d99527dcd Move generated aidl/logtags java classes to a subfolder
So that they can't be generated into src/, which would be added to the
source list automatically.

Bug: 36698184
Test: m telephony-common without this change, pass
Test: m telephony-common without the cleanspec, fail with dup class
Test: m telephony-common with the cleanspec, pass
Change-Id: I7b2fc1847d52ff4a9ba8c69e76123fe152629ef8
2017-09-29 20:36:50 -07:00
Dan Willemsen 74616d7802 Add CleanSpec.mk entries for linux -> linux_glibc
Soong renamed intermediate directories from linux_(common|x86|x86_64)...
to linux_glibc_(common|x86|x86_64)..., so remove the old versions to
save space.

Test: Check for old intermediates after applying and running cleanspec
Change-Id: I73ff39014491826224535e1d45c2215669fd19a2
2017-09-27 15:08:27 -07:00
Bowgo Tsai 9a05dca429 Copy adbd from system/bin to recovery/root/sbin
This change will be submitted with other changes moving adbd from
root/sbin to system/bin. We need to copy it specifically to recovery root.
Previously it was copied by rsync $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT).

Bug: 63910933
Test: normal boot sailfish, checks adb works
Test: recovery boot sailfish, checks adb works
Test: normal boot bullhead, checks adb works
Test: recovery boot bullhead, checks adb works

Change-Id: Ib49605f97a190aec2648cb000d1159b6e15db673
Merged-In: Ib49605f97a190aec2648cb000d1159b6e15db673
(cherry picked from commit 3147e7cfab)
2017-08-24 14:27:49 +08:00
Colin Cross bc291e63a0 Clean jack intermediates
Jack is no longer the default java compiler, clean the intermediates
to save space.

Bug: 36902714
Test: manual
Change-Id: I368442c8ad71eb5839c52839f2aa6ca55cf20bdd
2017-08-01 13:12:40 -07:00
Dan Willemsen 8533fa1b9d Fix install location for vendor tests
Bug: 63393698
Test: m -j hidl_test_client; apply; m -j hidl_test_client
Change-Id: Ia54a8d2aaedd63ce1d70944ee69fda3b9fe223a9
2017-07-06 17:46:17 -07:00
Dan Willemsen 3eb44160e0 Move version checking to soong_ui
This removes versions_checked.mk that caused kati to regenerate the
ninja file 3 times for a clean out directory. Kati needs to regenerate
every time that we write a file that we also read. soong_ui doesn't have
this problem.

Bug: 35970961
Test: m clean; m -j blueprint_tools; m -j blueprint_tools; m -j blueprint_tools
Test: $OUT_DIR/versions_checked.mk no longer exists
Change-Id: I14b67dc275ea3daa77a7315c2985dc73d77fd07c
2017-05-15 14:02:38 -07:00
Dan Willemsen 9d2b3280e8 Support split /system and /vendor modules from Soong
Soong modules may be split into both /system and /vendor variants.
Ensure that Make libraries link against the correct version based on
whether LOCAL_USE_VNDK is set.

Bug: 36426473
Bug: 36079834
Test: build-aosp_arm64.ninja files are the same before/after
Test: attempt building with BOARD_VNDK_VERSION:=current
Change-Id: I229bc290373743406275f3ca16081eae04c27987
2017-04-10 15:54:50 -07:00
Vishwath Mohan b285c46bbd Refactor sanitized library on-disk layout - Make.
This CL moves the location of ASAN-ified libraries on disk in the
following manner:
/data/lib* --> /data/asan/system/lib*
/data/vendor/* --> /data/asan/vendor/*

There are a couple of advantages to this, including better isolation
from other components, and more transparent linker renaming and
SELinux policies.

Bug: 36574794
Bug: 36674745
Test: m -j40 && SANITIZE_TARGET="address" m -j40 and the device
boots. All sanitized libraries are correctly located in /data/asan/*.

Change-Id: Ic6ba8e43e31df2ea92b85fd60f572823b6883ba2
2017-03-30 20:14:27 -07:00
Dan Willemsen de4e71b27b Revert "install *.so in different paths for their types"
This reverts commit 842a985f90. It's
causing test failures, warnings and complaints, so backing it out and
we'll resolve those before putting it back in.

This also bundles in the revert of a minor warning/error fixup for this
code, and does the correct thing with the CleanSpec.mk (which can't just
be reverted).

Bug: 33681361
Test: m -j
Change-Id: Ic889ce6a4737a497ad6bf633424ce1860713f7d0
2017-03-16 16:54:40 -07:00
Jiyong Park 842a985f90 install *.so in different paths for their types
Shared libraries are now installed to different directories depending on
their types.

* NDK libraries: /system/lib/ndk (with symlink from /system/lib)
* VNDK libraries: /system/lib/vndk
* VNDK-ext libraries: /system/lib/vndk-ext
* Framework-only libraries: /system/lib
* Vendor-only libraries: /vendor/lib
* Same-process HALs: /vendor/lib/sameprocess

However, if LOCAL_MODULE_PATH is explicitly set, then it is respected,
with a warning message. Module owners are highly encouraged to
investigate the warnings and use alternatives to LOCAL_MODULE_PATH;
combination of LOCAL_[PROPRIETARY|OEM|ODM]_MODULE, LOCAL_MODULE_CLASS
and LOCAL_RELATIVE_PATH will cover most of the cases.

Furthermore, for each shared libraries whose path is changed, a symolic
link from the original path to the new path is *temporarily* generated.
e.g. /system/lib/libbase.so -> vndk/libbase.so. This is
to prevent sudden breakage of the code expecting the lib from the old
path. This symbolic links will eventually be removed before O launch
(b/34917183).

Finally, BOARD_SAME_PROCESS_HAL_DEPS is added. It contains the list of
shared libraries implementing the same-process HALs and its internal sub
libraries. This is designed to be defined in BoardConfig.mk

Bug: 33681361
Test: build & run. Libraries must be in the correct directories.
Symlinks from the old path to the new path must exist.

Change-Id: I46130aac09ae65400fd4d0abbc2e12dddd154fb1
2017-03-13 08:27:09 +09:00
Dan Willemsen b2a5c7b369 Fix init rc installation in vendor when LOCAL_MODULE_PATH is set
The init.rc path selection uses the same partition_tag detection to
select an installation partition. So make sure that we always set
partition_tag even if we've been given an explicit module path.

Bug: 35314904
Test: set proprietary: true to Soong module with an init rc, verify
      that was the only change to build-aosp_arm64.ninja
Change-Id: Ic6ffd7a5177959db96a34a24896b242ee5b09e41
2017-02-13 14:19:47 -08:00
Simran Basi 7fe57cfdcd Update CleanSpec.mk for the common testcase directories.
Fix an issue with incremental builds and the new common
testcase directories.

Bug: None
Test: Removed https://android-review.googlesource.com/#/c/234478/
      then ran `m cts-platform-version-check` then reapplied the
      change to verify the failure. Then applied this new change
      to verify the problem was resolved.

Change-Id: I77529021e852af35571fb99537d87100010b47af
2017-02-10 15:56:29 -08:00
Dan Willemsen 912de8e691 Fix incremental builds with AAPT2
When we removed the src/ directory, the R.stamp file was removed -- with
AAPT, this triggers src/android/Manifest.java to be regenerated. But
AAPT2 only uses the R.stamp file as a timestamp to find the
Manifest.java file, not to create it.

So add a new CleanSpec.mk to fix the builds by removing the target that
AAPT2 uses to generate the src/android/Manifest.java file.

Test: None
Change-Id: If56f326ad701f7f92aa7c8aeda57e92d9c62cff9
2016-12-22 13:18:21 -08:00
Dan Willemsen cf324af6b8 Remove generated java source post clean logic
Just move the proto and renderscript sources into their own directories
-- the entire directory is wiped if the file list changes since the
command line will change. So we can just enable/disable pulling sources
from those directories based on whether there were files in the list or
not.

Bug: 30947985
Test: m -j java
Test: Remove a proto file from a java lib, ensure the generated source
      is not included.
Change-Id: If7529979de6fa62a651933a3a974f47b033851d6
2016-12-22 10:37:31 -08:00
Dan Willemsen dc556b4bc0 Prohibit host modules from using LOCAL_COPY_HEADERS
am: 6e51ef61a7

Change-Id: Id7c80e4dba5a505a04ce47d459c0a525debc4d53
2016-11-29 20:42:37 +00:00
Dan Willemsen 6e51ef61a7 Prohibit host modules from using LOCAL_COPY_HEADERS
There are no users left, so remove all of this.

Test: lunch aosp_arm-eng; m -j native
Test: build/tools/kati_all_products.sh on aosp and internal master
Change-Id: I32f5c8b470a43dd203d7e20c192167630e4e6888
2016-11-28 13:46:17 -08:00
Dan Willemsen d111debc18 resolve merge conflicts of 8dadc2d to nyc-mr1-dev-plus-aosp
Change-Id: I296a81c17f9311a9425619141e1b5f5f5fb4c0dc
2016-09-12 21:43:19 -07:00
Dan Willemsen 8e6e6fdba9 Remove incremental workaround for aapt overlays
This workaround to clean package intermediates is no longer necessary,
as ninja reruns commands whose command line changes.

Test: switch between product overlays that use add-resource, verify
      R.java is regenerated.
Change-Id: Icb1f76360e39882e4401180414a031956777b020
2016-09-12 20:30:12 -07:00
Alex Light 4e358ab2c3 Add system_other partition, install odex files
For AB devices, support flashing two system partitions for factory use.
The normal system image on one partition, but without dex preopt. And a
system_other image that just contains the odex files. The dex files will
not be stripped out of the system image, in case the second system
partition is wiped.

Setting BOARD_USES_SYSTEM_OTHER_ODEX := true in the BoardConfig.mk
enables this behavior.

One can control which directories are placed in system_other by the
SYSTEM_OTHER_ODEX_FILTER configuration variable. Currently we default
to only copying only app and priv-app odexs.

Bug: 29278988
Change-Id: I7f4e87da919e7dc6a89fd8c668193cd4e98631bc
2016-06-24 11:07:15 -07:00
Tao Bao 6c5f0acbe8 Merge "CleanSpec: Clean up /recovery/root/sdcard." am: b69d3b28a5
am: 8994f9ca38

* commit '8994f9ca383fa887e570f54ea78bfeb9fdd39b2e':
  CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
2016-01-22 18:53:15 +00:00
Tao Bao 6b10089bd6 CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
Incremental build going across CL in [1] needs to remove the old
symlink to avoid hitting mkdir error.

[1]: commit 3f56a33041

Change-Id: Iff62ed55eb2782ba3e1e9b6de39a691de2427384
2016-01-21 17:18:47 -08:00
Ian Pedowitz 1406578847 Change PLATFORM_VERSION from NYC to N
But won't someone think of the cheesecake?

Bug: 25558821
Change-Id: Icf0adcb5b429a517fdbddb0d137d396a2d168c7c
2015-11-11 10:35:31 -08:00
Qiwen Zhao 5971fe3476 Merge commit '68e0bbf9'
Change-Id: I04f361807f8568bc87c4d035d52594eff16955fa
2015-08-12 18:54:45 -07:00
Dianne Hackborn e593e5c42a Fix issie #23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Dianne Hackborn 307631b057 Remove M codename, version number is 6.0.
Change-Id: I27b477f087b135232f14157123d31da04dee04d7
2015-07-29 14:22:51 -07:00
Dianne Hackborn 543aeac3fa am c3db771c: am 578a9efd: Merge "Raise API level to 23." into mnc-dev
* commit 'c3db771cac9a2d448f4f624ac410377c30fc6158':
  Raise API level to 23.
2015-06-27 00:58:12 +00:00
Dianne Hackborn a42551685f Raise API level to 23.
Now apps can target both MNC and 23.

Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
2015-06-26 15:54:10 -07:00
Bart Sears 80cbcc48d3 Master has moved on
Change master so it no longer thinks it is building MNC.

Change-Id: I0b68e78d02b7ceadbef0ca95fc74d20d31076881
2015-05-14 22:04:41 -07:00
Bart Sears 0ed694f326 DO NOT MERGE - Change PLATFORM_VERSION from MNC to M
Goodbye to the cookie...

Change-Id: I0474115250411ccdfbdc769c6a464f9dbc460e8f
2015-05-12 18:42:13 -07:00
Mathieu Chartier 0626a6421e am 783a632f: am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
* commit '783a632f45fdddaa2073445728db61d2041a3435':
  Change eng builds from interpret-only to verify-at-runtime
2015-03-23 22:55:28 +00:00
Mathieu Chartier 62a7cac50d Change eng builds from interpret-only to verify-at-runtime
Faster dex2oat -> faster boot after syncing core libraries.

Bug: 19762303
Change-Id: Ic266ed9c59829e0e18acc4adc103724cf480de7f
2015-03-20 11:15:20 -07:00
Mathieu Chartier eda38d7718 am b01a4ca3: am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
* commit 'b01a4ca3c838007d2e8f71c01b37f8e878cff686':
  Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
2015-03-19 17:06:47 +00:00
Mathieu Chartier 8b11285dd9 Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
Bug: 19735273

This reverts commit 3abfcfc17b.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
2015-03-18 19:06:28 -07:00
Mathieu Chartier 7c2d49dcb9 am 7b93109e: am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
* commit '7b93109e48f90f756228bfe399b67d5d8cc306b0':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
2015-03-17 14:47:31 +00:00
Mathieu Chartier 3abfcfc17b Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
2015-03-16 16:29:30 -07:00
Mathieu Chartier 0694eabe4d JIT default opt-in
Bug: 17950037

(cherry picked from commit 2a2a03046e)

Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 18:27:54 -07:00
Mathieu Chartier 2a2a03046e JIT default opt-in
Bug: 17950037
Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
2015-03-12 14:45:22 -07:00
Dianne Hackborn c421abfcd5 Update version to MNC.
Change-Id: I67a69efa90babcfbc3e83907e46be0833c0ddcdd
2015-01-22 16:36:55 -08:00
Narayan Kamath 675a726fe4 resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp
Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212
2015-01-22 18:53:59 +00:00
Narayan Kamath baf3eb93ee Add ro.product.locale
This is a BCP-47 language tag representing the default locale for a
given device. Support for the earlier mechanism of supplying a language
and region via ro.product.locale.region/language has been removed. This
change also removes support for supplying these properties via
PRODUCT_ADDITIONAL_PROPERTY_OVERRIDES. Devices that need to override
this should either rearrange their PRODUCT_LANGUAGES or supply a custom
.prop file.

bug: 17691569

Change-Id: I00c74098542b49b9c514a6ca39ea8d08179546c1
2015-01-16 10:16:52 +00:00
Ed Heyl 898b9e43cf resolve conflicts w/aaf823d2
Change-Id: I7c5cf1d1e074a67bdd19a7cf51f45e5f3e026c84
2014-12-08 10:53:50 -08:00
Dianne Hackborn 0421d0b115 Fix issue #18368417: 5.0 -> 5.1.
Change-Id: Icd7137fe8b1bda1c5aaf170aa7b19a58832144c8
2014-12-04 12:10:32 -08:00
Dan Albert 4bf9b396bd am 29f8d7d6: Merge "Make gnu++11 the default standard version."
* commit '29f8d7d68a8dadd9cb2f087caa1f02a5240e8a07':
  Make gnu++11 the default standard version.
2014-11-25 19:58:41 +00:00
Dan Albert bf0426f474 Make gnu++11 the default standard version.
There are a _lot_ of users of `typeof` in the tree, and they'll need a
GNU flavored standard. Rather than fixing up all of these
individually, let's just use gnu++11 as the default.

Bug: 18466763
Change-Id: Ia1bd3adaa74fadba259fda3d37653fb8d5cff69a
2014-11-24 15:53:31 -08:00
Stephen Hines 20bebfe456 am 74b2870a: Merge "Clean out *.prop files due to dex2oat instruction-set flag change."
* commit '74b2870a272a4f069354dcc262c3af3042943969':
  Clean out *.prop files due to dex2oat instruction-set flag change.
2014-11-14 03:15:14 +00:00
Stephen Hines 39bf012335 Clean out *.prop files due to dex2oat instruction-set flag change.
Change-Id: Ib1e94cfe08bad9e51fd46e8a1a09926877f179de
2014-11-13 19:04:28 -08:00
Dan Albert 420773ae53 resolved conflicts for merge of ebc32090 to lmp-mr1-dev-plus-aosp
Change-Id: Icfa9c3424a2e75a07eaa453663b03a12897809a9
2014-11-07 14:20:57 -08:00
Dan Albert 7337a822a8 Cleanspec for libc++ migration.
This affects most native code in the tree, so the only real option is
to nuke out from orbit.

Change-Id: Ia3a794731e703c3ca02b55f6f7827d3425dca5cb
2014-11-07 13:24:56 -08:00
Dianne Hackborn 87fa865bea am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev
* commit '374712c54f5416e14523eec15456bb8b4372ffac':
  Move up to API 21, Lollipop MR1.
2014-10-17 17:19:57 +00:00
Dianne Hackborn 4a6a7524b3 Move up to API 21, Lollipop MR1.
Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
2014-10-17 10:05:33 -07:00
Dianne Hackborn 8ae0f88b78 am e105b8f2: Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev
* commit 'e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4':
  And then L, without ever becoming a real code name, transforms like magic to 5.0.
2014-09-26 00:22:31 +00:00
Dianne Hackborn a0fdca5e79 am e105b8f2: Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev
* commit 'e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4':
  And then L, without ever becoming a real code name, transforms like magic to 5.0.
2014-09-25 00:40:56 +00:00
Dianne Hackborn 105df2f1d2 And then L, without ever becoming a real code name, transforms like magic to 5.0.
The code name looked at 5.0 despondently.  "Won't anyone care about
me?  Why does everyone pretend like I don't even exist!"  And it
was true -- for all of its life, nobody had ever whispered L's
true name, at least not in the same breath as many other names that
were not L's at all.

But 5.0 knew better.  "L," the number said, "don't you fear.  Some
day, I am sure, your name will go up in lights.  Your name will shine
brighter than even my own.  And everyone who is anyone will know
your name, write pages and pages all about your name, and debate
endlessly about everything you are."

L could only hope this would be true.  But not today.  Today, L
is still nobody.

Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8
2014-09-22 15:55:23 -07:00
Dianne Hackborn 54256fd45c am e4584a41: Merge "Shhhhhhh!!!" into lmp-dev
* commit 'e4584a412960e18709953eee942bceaa85b100f8':
  Shhhhhhh!!!
2014-08-26 21:16:47 +00:00
Dianne Hackborn bf9b9275af Shhhhhhh!!!
Change-Id: I3bb72742f788c70f82f311b6ffba479aa02a1eb0
2014-08-26 12:39:26 -07:00
Brian Carlstrom cced082f5d Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413

(cherry picked from commit 4d30e5e260)

Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
2014-08-06 17:50:39 -07:00
Brian Carlstrom 479eca858c resolved conflicts for merge of 9b80095e to lmp-dev-plus-aosp
Change-Id: Id37b96441818c5542b8c340f968183162a47191a
2014-08-04 12:21:46 -07:00
Brian Carlstrom 4d30e5e260 Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
2014-07-30 15:57:16 -07:00
Tim Murray 72c70d14d4 resolved conflicts for merge of 2812b27c to lmp-dev-plus-aosp
Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7
2014-07-24 14:27:05 -07:00
Tim Murray 92d79cbb41 Switch host builds to use Clang by default.
If LOCAL_CLANG is not set to false for a host module, clang will be used instead of gcc.

This also enables the integrated assembler by default for Darwin host builds.

bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-24 09:25:58 -07:00
Ying Wang af9757e849 New installation path for apks and their JNIs.
Apk's path is changed to <parent_dir>/MyApp/MyApp.apk;
JNI path is changed to <parent_dir>/MyApp/lib/<arch_name>/libfoo.so.
Symlinks of JNIs are changed accordingly.

Bug: 16319961
Change-Id: Ib3b2309c95fa9aea27837fcc29e28d990b04747b
2014-07-18 16:26:24 -07:00
Brian Carlstrom b1c9734b68 am ef0b6e0c: am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit 'ef0b6e0c19eb37f4fbc42491771611e247168519':
  Make dex2oat heap size product configurable [build]
2014-07-09 15:07:13 +00:00
Brian Carlstrom ef0b6e0c19 am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
  Make dex2oat heap size product configurable [build]
2014-07-09 12:36:31 +00:00
Brian Carlstrom cffe289dc6 Make dex2oat heap size product configurable [build]
Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
2014-07-08 11:33:45 -07:00
Narayan Kamath b60ccd6672 am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary"
* commit 'ae65e2eb8d5f530d4292a5c70bac113f18900e9d':
  Make default 64-bit primary, 32-bit secondary
2014-06-17 10:05:13 +00:00
Brian Carlstrom d795046319 Make default 64-bit primary, 32-bit secondary
Change-Id: I2613a5072e2778307eebdc95d81f184f748ce9f5
2014-06-16 23:59:43 -07:00
Narayan Kamath 9d62dbc532 resolved conflicts for merge of b60ccd66 to master
Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
2014-06-17 11:11:35 +01:00
Brian Carlstrom 8f15beac84 Adding CleanSpec for adding BOOTCLASSPATH to ims-common.jar
Bug: 15616246
Change-Id: Idce2fb20943f4d4ba6dd66f95f9f5bbd9caefb46
2014-06-13 22:20:39 -07:00
Dianne Hackborn dd0afa03f2 resolved conflicts for merge of 0c651756 to master
Change-Id: Ifd66a3daa792f88ac2db0c24a11962d445e8f22d
2014-06-12 11:34:48 -07:00
Dianne Hackborn 997b896eeb Update to reflect KKWT's graduation to API 20.
Change-Id: I4716e71d72b2526fe635079d1b15f623db842c21
2014-06-11 14:24:32 -07:00
Ying Wang f7988507f4 am 2d19cbd2: resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp
* commit '2d19cbd279ed69c7202f089be174c35c1585f709':
  Switch to 32-bit-by-default host multilib build.
2014-06-11 19:26:30 +00:00
Ying Wang 2d19cbd279 resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp
Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
2014-06-10 09:45:45 -07:00
Ying Wang 2713fcebba Switch to 32-bit-by-default host multilib build.
Also we don't need to force LLVM built from source, for we already force
LLVM to be built as 32-bit.

Bug: 13751317
Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
2014-06-09 17:48:05 -07:00
Brian Carlstrom 8fe9c76d9a resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aosp
Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
2014-05-29 14:01:24 -07:00
Brian Carlstrom 2267c22b3d am f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit 'f2a2406b8c01e71603feaa5eaccd75d26ea76804':
  Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 19:39:49 +00:00
Brian Carlstrom 1e60fe58f0 Remove dependencies on runtime_libdvm and libdvm.so in general
Bug: 14298175

(cherry picked from commit bf8a374a92)

Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
2014-05-29 09:37:25 -07:00
Brian Carlstrom 5da48a3394 am bf8a374a: Remove dependencies on runtime_libdvm and libdvm.so in general
* commit 'bf8a374a92e327efed95892fe67e6917a89c6c2b':
  Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 16:37:19 +00:00
Brian Carlstrom bf8a374a92 Remove dependencies on runtime_libdvm and libdvm.so in general
Bug: 14298175
Change-Id: I8441b64dc33543a912aebcfb8fdf76114ec50abe
2014-05-28 21:27:47 -07:00
Brian Carlstrom 9843e86395 am ed97938c: am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit 'ed97938caa7a1e7cde1d060ebbe6f6af1279188e':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:13:28 +00:00
Brian Carlstrom ee26bf6a84 resolved conflicts for merge of 7e127ebe to master
Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1
2014-05-28 16:02:45 -07:00
Brian Carlstrom ed97938caa am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:44 +00:00
Brian Carlstrom 31f5db27c6 Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175

(cherry picked from commit 7e127ebe0b)

Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
2014-05-28 14:49:34 -07:00
Brian Carlstrom 7e127ebe0b Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175
Change-Id: Ie4a716dddddc4d339fd4f47033f2c546a1ca118a
2014-05-28 14:31:46 -07:00
Narayan Kamath 7d55bea91f resolved conflicts for merge of 38c3c930 to master
Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
2014-05-27 12:29:41 +01:00
Narayan Kamath cc25436841 am 06db7324: resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp
* commit '06db73241a12a6b5f352647e966d254ae6443f68':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.
2014-05-27 11:23:39 +00:00
Narayan Kamath 38c3c9309f am 6c2ae327: am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '6c2ae327665396958ba6f08dc72bc30b3455d046':
  Switch x86_64 emulator to 64 bit primary.
2014-05-27 11:23:34 +00:00
Narayan Kamath 06db73241a resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp
Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f
2014-05-27 12:21:22 +01:00
Narayan Kamath 6c2ae32766 am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."
* commit '8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
  Switch x86_64 emulator to 64 bit primary.
2014-05-27 11:15:57 +00:00
Narayan Kamath 0f99bb3d0b am 7b31bd3e: Merge "Remove hardcoded TARGET_PREFER_32_BIT_APPS."
* commit '7b31bd3e8f25b9b232204d4b64399d78d6e41163':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.
2014-05-27 11:15:56 +00:00
Narayan Kamath 62da5fd161 Switch x86_64 emulator to 64 bit primary.
Also siezes the opportunity to remove the hardcoded
TARGET_PREFER_32_BIT_APPS directing in core_64_bit.mk.
This avoids the need for further hacks but needs supporting
changes to a few apps to force them to 32 bit.

Change-Id: I36ba9e5f5b08dd87d6a4afc27961a436306eed99
2014-05-27 12:12:00 +01:00
Narayan Kamath 214c53a022 Remove hardcoded TARGET_PREFER_32_BIT_APPS.
This isn't required any longer, besides individual products
should be allowed to set this value themselves.

(cherry picked from commit 7b9347a7f9)

Change-Id: If459eab32c6e7831596224ad3503baefbf028133
2014-05-27 12:08:33 +01:00
Griff Hazen 0413efd261 resolved conflicts for merge of 3bb81eb0 to klp-modular-dev-plus-aosp 2014-05-20 20:05:08 -07:00
Justin Koh f6c21e7262 Set API version for KKWT. DO NOT MERGE
Set API level and version string for KKWT.

Change-Id: I18178e9286e6115f4f7273d4489dd91b3205e5cf
2014-05-14 18:57:42 -07:00
Brian Carlstrom 0e183b2d33 am 676c8f04: am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '676c8f0450a9dfb84c12257195ba05619aeed970':
  Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 22:00:37 +00:00
Brian Carlstrom 676c8f0450 am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '4ed19f0f4294544d0447025f0079a9d9e185a495':
  Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 21:57:32 +00:00