Commit f95bed50 authored by xueliang.zhong's avatar xueliang.zhong Committed by Roland Levillain
Browse files

Revert^2 "Merge remote-tracking branch 'remotes/aosp/upstream-master'" 

This reverts commit 4e90e856.

Recent AOSP/VIXL update exposed the problem of loading two separate VIXL
libraries libvixl-arm and libvixl-arm64 in one process.

This revert fixes this by building only one libvixl.

Test: test-art-host, test-art-target.

Change-Id: Ida019ae692ad0b2c256b2f7a163fe3ed0cbc786d
parent 9c53ca68
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment