Use __ANDROID_NATIVE_BRIDGE__ define instead of target:arm_on_x86
Currently target:arm_on_x86 is defined both for native_bridge targets
and for non-native_bridge targets.
But we already have a way to detect native_bridge.
Also fixed 64-bit paths.
Bug: http://b/153609531
Test: cts-tradefed run cts --abi armeabi-v7a -m CtsRsCppTestCases
Test: cts-tradefed run cts --abi arm64-v8a -m CtsRsCppTestCases
Change-Id: I2f0770fe8d406b5a9b8a491a7d87202d2a674d24
Merged-In: I2f0770fe8d406b5a9b8a491a7d87202d2a674d24
2 files changed