It turns out we should also LOCAL_INSTRUMENTATION_FOR.
To disambiguate LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME is renamed to LOCAL_MANIFEST_INSTRUMENTATION_FOR.
Bug: 2902591
Change-Id: I6cb893c135736fc4170aa2259105b4c5eea798a1
Merge commit '54b8b436a380b053772110796642c7e5e6ba8e64'
* commit '54b8b436a380b053772110796642c7e5e6ba8e64':
Allow properties with spaces in their values
Merge commit 'de3bfade571033b01fbaccac2f0fdf7193e8d3ee' into gingerbread-plus-aosp
* commit 'de3bfade571033b01fbaccac2f0fdf7193e8d3ee':
Allow properties with spaces in their values
This way, such properties can be set in product definition files
instead of having to live in system.prop, which eliminates the need
for system.prop
Change-Id: I25d9665f65436df8215940e46380deb31b8161ba
Merge commit 'dda34f535d01518e44564a9cde525b768042cf90'
* commit 'dda34f535d01518e44564a9cde525b768042cf90':
Disable new longjmp in glibc 2.11 and later.
Merge commit '2e1347c6a010c51c9ec80fd312465c1c23666ab2'
* commit '2e1347c6a010c51c9ec80fd312465c1c23666ab2':
Disable new longjmp in glibc 2.11 and later.
Merge commit '42f406593e7fb1124e6aa00cc060e421d5a53554' into gingerbread-plus-aosp
* commit '42f406593e7fb1124e6aa00cc060e421d5a53554':
Disable new longjmp in glibc 2.11 and later.
Merge commit 'fb644881b6083aa0d9d15e7aad8bfa5a429b1c37' into gingerbread-plus-aosp
* commit 'fb644881b6083aa0d9d15e7aad8bfa5a429b1c37':
Disable new longjmp in glibc 2.11 and later.
Merge commit '85fd5030b11d412f345b0ed039aa9912c7973aea' into gingerbread-plus-aosp
* commit '85fd5030b11d412f345b0ed039aa9912c7973aea':
Revert "Fixed problem with keymap files copied to target"
Merge commit '8abb5cc10f295940e6706c72e2e0c93bf0de01e8'
* commit '8abb5cc10f295940e6706c72e2e0c93bf0de01e8':
Fixed problem with keymap files copied to target
Merge commit 'a160e3169e6624610fd05b2edd14b674ffb54e44' into gingerbread-plus-aosp
* commit 'a160e3169e6624610fd05b2edd14b674ffb54e44':
Fixed problem with keymap files copied to target
Merge commit 'cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp
* commit 'cd7c775ece6854765ae3208818e76d9d11724713':
fix the build still
Merge commit '0f9a91c94fa9f3b0082744efe2457528ef19fa62'
* commit '0f9a91c94fa9f3b0082744efe2457528ef19fa62':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp
* commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit 'a39896119566a952647c392872c0ab99e9de7371' into gingerbread-plus-aosp
* commit 'a39896119566a952647c392872c0ab99e9de7371':
Cleanspec to make sure everything works consistently after turning off OpenCore.
Merge commit 'a681bae5f6d2cc84d0ff54bb117ecd025062bbce'
* commit 'a681bae5f6d2cc84d0ff54bb117ecd025062bbce':
Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit '9a8732fb6c6a569495e3695fc1e2b638de209beb' into gingerbread-plus-aosp
* commit '9a8732fb6c6a569495e3695fc1e2b638de209beb':
Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp
* commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.
Change-Id: I7cd80497632fb3b9e7ce2f3a7888d4924a355f52
Merge commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3' into gingerbread-plus-aosp
* commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3':
SDK: add hierarchyviewer2 to windows target list.
