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

Commit f7ea7c7b authored by Christopher Wiley's avatar Christopher Wiley Committed by Android Git Automerger
Browse files

am 1643e97b: Merge "aidl: Pull main() into dedicated file" 

* commit '1643e97b':
  aidl: Pull main() into dedicated file
parents 72b1324c 1643e97b

tools/aidl/AST.h

+3 −3
Original line number Diff line number Diff line 
#ifndef AIDL_AST_H

#define AIDL_AST_H

#ifndef AIDL_AST_H_

#define AIDL_AST_H_



#include <string>

#include <vector>
@@ -368,4 +368,4 @@ struct Document 
    virtual void Write(FILE* to);

};



#endif // AIDL_AST_H
 
#endif // AIDL_AST_H_

tools/aidl/Android.mk

+12 −11
Original line number Diff line number Diff line
@@ -20,17 +20,18 @@ LOCAL_CFLAGS += -Wno-deprecated-register 
LOCAL_CFLAGS += -Wno-writable-strings



LOCAL_SRC_FILES := \

	aidl_language_l.l \

	aidl_language_y.y \

	aidl.cpp \

	aidl_language.cpp \

	options.cpp \

	search_path.cpp \

    AST.cpp \

    Type.cpp \

    aidl.cpp \

    aidl_language.cpp \

    aidl_language_l.l \

    aidl_language_y.y \

    generate_java.cpp \

    generate_java_binder.cpp \

	generate_java_rpc.cpp

    generate_java_rpc.cpp \

    main.cpp \

    options.cpp \

    search_path.cpp \



LOCAL_MODULE := aidl

tools/aidl/Type.h

+3 −3
Original line number Diff line number Diff line 
#ifndef AIDL_TYPE_H

#define AIDL_TYPE_H

#ifndef AIDL_TYPE_H_

#define AIDL_TYPE_H_



#include "AST.h"

#include <string>
@@ -539,4 +539,4 @@ extern Expression* FALSE_VALUE; 


void register_base_types();



#endif // AIDL_TYPE_H
 
#endif // AIDL_TYPE_H_

tools/aidl/aidl.cpp

+2 −23
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ check_and_assign_method_ids(const char * filename, interface_item_type* first_it 
}



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

static int

int

compile_aidl(Options& options)

{

    int err = 0, N;
@@ -1063,7 +1063,7 @@ compile_aidl(Options& options) 
    return err;

}



static int

int

preprocess_aidl(const Options& options)

{

    vector<string> lines;
@@ -1135,24 +1135,3 @@ preprocess_aidl(const Options& options) 
    close(fd);

    return 0;

}
 


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

int

main(int argc, const char **argv)

{

    Options options;

    int result = parse_options(argc, argv, &options);

    if (result) {

        return result;

    }



    switch (options.task)

    {

        case COMPILE_AIDL:

            return compile_aidl(options);

        case PREPROCESS_AIDL:

            return preprocess_aidl(options);

    }

    fprintf(stderr, "aidl: internal error\n");

    return 1;

}

tools/aidl/aidl.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef AIDL_AIDL_H_

#define AIDL_AIDL_H_



#include "options.h"



int compile_aidl(Options& options);

int preprocess_aidl(const Options& options);



#endif  // AIDL_AIDL_H_