Fix stack tool to find the correct toolchain
Change-Id: Ie525b286a4d133512c72b234f03e54f8635c15ee
This commit is contained in:
@@ -46,7 +46,7 @@ def ToolPath(tool, toolchain_info=None):
|
|||||||
if not toolchain_info:
|
if not toolchain_info:
|
||||||
toolchain_info = TOOLCHAIN_INFO
|
toolchain_info = TOOLCHAIN_INFO
|
||||||
(label, target) = toolchain_info
|
(label, target) = toolchain_info
|
||||||
return os.path.join(ANDROID_BUILD_TOP, "prebuilt", Uname(), "toolchain", label, "bin",
|
return os.path.join(ANDROID_BUILD_TOP, "prebuilts", "gcc", Uname(), "arm", label, "bin",
|
||||||
target + "-" + tool)
|
target + "-" + tool)
|
||||||
|
|
||||||
def FindToolchain():
|
def FindToolchain():
|
||||||
@@ -61,6 +61,7 @@ def FindToolchain():
|
|||||||
|
|
||||||
## Known toolchains, newer ones in the front.
|
## Known toolchains, newer ones in the front.
|
||||||
known_toolchains = [
|
known_toolchains = [
|
||||||
|
("arm-eabi-4.6", "arm-eabi"),
|
||||||
("arm-linux-androideabi-4.4.x", "arm-linux-androideabi"),
|
("arm-linux-androideabi-4.4.x", "arm-linux-androideabi"),
|
||||||
("arm-eabi-4.4.3", "arm-eabi"),
|
("arm-eabi-4.4.3", "arm-eabi"),
|
||||||
("arm-eabi-4.4.0", "arm-eabi"),
|
("arm-eabi-4.4.0", "arm-eabi"),
|
||||||
|
|||||||
Reference in New Issue
Block a user