diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-11-05 12:52:01 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-11-05 12:52:01 +0000 |
| commit | 6c019a8293f8058b990aeee1862b256f179efa3b (patch) | |
| tree | 4a469299c6c538a06c5280cbc594490b6882e28c | |
| parent | b890cb32443449e1eae16633add363883a63dfac (diff) | |
| download | libvpx-6c019a8293f8058b990aeee1862b256f179efa3b.tar.gz | |
Update makefiles after merge of Chromium at a2687e6f753c
This commit was generated by merge_from_chromium.py.
Change-Id: I2de5c09962d9becc194f95397a04eea24e81fa5b
| -rw-r--r-- | libvpx_obj_int_extract.host.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.darwin-arm64.mk | 1 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.darwin-x86_64.mk | 1 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-arm.mk | 1 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-arm64.mk | 1 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-x86.mk | 1 | ||||
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-x86_64.mk | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/libvpx_obj_int_extract.host.darwin-arm.mk b/libvpx_obj_int_extract.host.darwin-arm.mk index 6bf553d..ffdbf7d 100644 --- a/libvpx_obj_int_extract.host.darwin-arm.mk +++ b/libvpx_obj_int_extract.host.darwin-arm.mk @@ -199,6 +199,7 @@ LOCAL_GYP_LIBS := LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS) ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/libvpx_obj_int_extract.host.darwin-arm64.mk b/libvpx_obj_int_extract.host.darwin-arm64.mk index e6d035e..25c885e 100644 --- a/libvpx_obj_int_extract.host.darwin-arm64.mk +++ b/libvpx_obj_int_extract.host.darwin-arm64.mk @@ -197,6 +197,7 @@ LOCAL_GYP_LIBS := LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS) ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/libvpx_obj_int_extract.host.darwin-x86.mk b/libvpx_obj_int_extract.host.darwin-x86.mk index 84d05ab..43e01a6 100644 --- a/libvpx_obj_int_extract.host.darwin-x86.mk +++ b/libvpx_obj_int_extract.host.darwin-x86.mk @@ -199,6 +199,7 @@ LOCAL_GYP_LIBS := LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS) ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/libvpx_obj_int_extract.host.darwin-x86_64.mk b/libvpx_obj_int_extract.host.darwin-x86_64.mk index b18771a..37d9a12 100644 --- a/libvpx_obj_int_extract.host.darwin-x86_64.mk +++ b/libvpx_obj_int_extract.host.darwin-x86_64.mk @@ -199,6 +199,7 @@ LOCAL_GYP_LIBS := LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS) ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/libvpx_obj_int_extract.host.linux-arm.mk b/libvpx_obj_int_extract.host.linux-arm.mk index 66f2fda..2468930 100644 --- a/libvpx_obj_int_extract.host.linux-arm.mk +++ b/libvpx_obj_int_extract.host.linux-arm.mk @@ -203,6 +203,7 @@ LOCAL_GYP_LIBS := LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS) ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/libvpx_obj_int_extract.host.linux-arm64.mk b/libvpx_obj_int_extract.host.linux-arm64.mk index 32bfb6b..ee37639 100644 --- a/libvpx_obj_int_extract.host.linux-arm64.mk +++ b/libvpx_obj_int_extract.host.linux-arm64.mk @@ -201,6 +201,7 @@ LOCAL_GYP_LIBS := LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS) ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk index 23d5802..fd7187f 100644 --- a/libvpx_obj_int_extract.host.linux-x86.mk +++ b/libvpx_obj_int_extract.host.linux-x86.mk @@ -203,6 +203,7 @@ LOCAL_GYP_LIBS := LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS) ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. diff --git a/libvpx_obj_int_extract.host.linux-x86_64.mk b/libvpx_obj_int_extract.host.linux-x86_64.mk index 3355ab6..6421115 100644 --- a/libvpx_obj_int_extract.host.linux-x86_64.mk +++ b/libvpx_obj_int_extract.host.linux-x86_64.mk @@ -203,6 +203,7 @@ LOCAL_GYP_LIBS := LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS) ### Set directly by aosp_build_settings. +LOCAL_CXX_STL := libstdc++ LOCAL_CLANG := true # Add target alias to "gyp_all_modules" target. |