Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d30bf73 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Convert aapt to Soong" am: 7bd321ca am: 9f5e3e82 

am: 946e6eed

Change-Id: Iffb3b89148643365a356512d806a4e9e123e359b
parents 48990ce0 946e6eed

tools/aapt/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -98,6 +98,17 @@ cc_library_host_static { 
    ],

}



// ==========================================================

// Build the host executable: aapt

// ==========================================================

cc_binary_host {

    name: "aapt",

    defaults: ["aapt_defaults"],

    srcs: ["Main.cpp"],

    use_version_lib: true,

    static_libs: ["libaapt"],

}



// ==========================================================

// Build the host tests: libaapt_tests

// ==========================================================

tools/aapt/Android.mk

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
#

# Copyright (C) 2014 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)



# ==========================================================

# Setup some common variables for the different build

# targets here.

# ==========================================================

LOCAL_PATH:= $(call my-dir)



aaptHostStaticLibs := \

    libandroidfw \

    libpng \

    libutils \

    liblog \

    libcutils \

    libexpat \

    libziparchive \

    libbase \

    libz



aaptCFlags := -Wall -Werror



# ==========================================================

# Build the host executable: aapt

# ==========================================================

include $(CLEAR_VARS)



LOCAL_MODULE := aapt

LOCAL_MODULE_HOST_OS := darwin linux windows

LOCAL_CFLAGS := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\" $(aaptCFlags)

LOCAL_SRC_FILES := Main.cpp

LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs)



include $(BUILD_HOST_EXECUTABLE)



endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK

tools/aapt/Main.cpp

+2 −5
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "Main.h"

#include "Bundle.h"



#include <build/version.h>

#include <utils/Compat.h>

#include <utils/Log.h>

#include <utils/threads.h>
@@ -20,10 +21,6 @@ using namespace android; 


static const char* gProgName = "aapt";



#ifndef AAPT_VERSION

    #define AAPT_VERSION ""

#endif



/*

 * Show version info.  All the cool kids do it.

 */
@@ -32,7 +29,7 @@ int doVersion(Bundle* bundle) 
    if (bundle->getFileSpecCount() != 0) {

        printf("(ignoring extra arguments)\n");

    }

    printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");

    printf("Android Asset Packaging Tool, v0.2-%s\n", android::build::GetBuildNumber().c_str());



    return 0;

}