From b9548b70742ac3557a5dd3f71a18da5650c5dbed Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 31 Oct 2018 10:17:02 -0700 Subject: Convert (further) to Android.bp See build/soong/README.md for more information Test: cd external/dtc; mma Test: check for dtc in build artifacts Change-Id: I2bdd1a2fc41d3e5c61de3c05f1097a8ddb7e1ea9 --- Android.bp | 33 ++++++++++++++++++++++++++++++--- Android.mk | 30 ------------------------------ 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/Android.bp b/Android.bp index 618466f..d82f32a 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,30 @@ -subdirs = [ - "libfdt" -] +// Copyright 2016 The Android Open Source Project + +cc_binary_host { + name: "dtc", + + cflags: [ + "-Wall", + "-Werror", + "-Wno-sign-compare", + "-Wno-missing-field-initializers", + "-Wno-unused-parameter", + ], + srcs: [ + "checks.c", + "data.c", + "dtc.c", + "dtc-lexer.l", + "dtc-parser.y", + "flattree.c", + "fstree.c", + "livetree.c", + "srcpos.c", + "treesource.c", + "util.c", + ], + + static_libs: ["libfdt"], + + stl: "none", +} diff --git a/Android.mk b/Android.mk index 4aafda0..733a40e 100644 --- a/Android.mk +++ b/Android.mk @@ -1,33 +1,3 @@ # Copyright 2016 The Android Open Source Project -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_CFLAGS := \ - -Wall \ - -Werror \ - -Wno-sign-compare \ - -Wno-missing-field-initializers \ - -Wno-unused-parameter -LOCAL_SRC_FILES := \ - checks.c \ - data.c \ - dtc.c \ - dtc-lexer.l \ - dtc-parser.y \ - flattree.c \ - fstree.c \ - livetree.c \ - srcpos.c \ - treesource.c \ - util.c - -LOCAL_STATIC_LIBRARIES := \ - libfdt -LOCAL_CXX_STL := none - -LOCAL_MODULE := dtc - -include $(BUILD_HOST_EXECUTABLE) - $(call dist-for-goals, dist_files, $(ALL_MODULES.dtc.BUILT):dtc/dtc) -- cgit v1.2.3