update new sdk

This commit is contained in:
August 2020-07-15 19:27:51 +08:00
parent f33907443a
commit 744c72c133
1643 changed files with 83006 additions and 28021 deletions

View file

@ -18,6 +18,6 @@ LOCAL_CFLAGS += \
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../src $(LOCAL_PATH)/ external/v8
LOCAL_SHARED_LIBRARIES := libpac libutils liblog
LOCAL_SHARED_LIBRARIES := libpac libutils liblog libandroid_runtime
include $(BUILD_NATIVE_TEST)

View file

@ -0,0 +1,15 @@
// PAC script with getter that changes element kind.
function FindProxyForURL(url, host) {
let arr = [];
arr[1000] = 0x1234;
arr.__defineGetter__(256, function () {
delete arr[256];
arr.unshift(1.1);
});
let results = Object.entries(arr);
let str = results.toString();
return "DIRECT";
}

View file

@ -544,5 +544,19 @@ TEST(ProxyResolverV8Test, DNSResolutionOfInternationDomainName) {
EXPECT_EQ("xn--bcher-kva.ch", bindings->dns_resolves_ex[0]);
}
TEST(ProxyResolverV8Test, GetterChangesElementKind) {
ProxyResolverV8WithMockBindings resolver(new MockJSBindings());
int result = resolver.SetPacScript(String16(CHANGE_ELEMENT_KIND_JS));
EXPECT_EQ(OK, result);
// Execute FindProxyForURL().
result = resolver.GetProxyForURL(kQueryUrl, kQueryHost, &kResults);
EXPECT_EQ(OK, result);
std::vector<std::string> proxies = string16ToProxyList(kResults);
EXPECT_EQ(1U, proxies.size());
EXPECT_EQ("DIRECT", proxies[0]);
}
} // namespace
} // namespace net

View file

@ -78,6 +78,23 @@
"function fn() {}\n" \
"\n" \
#define CHANGE_ELEMENT_KIND_JS \
"// PAC script with getter that changes element kind.\n" \
" \n" \
"function FindProxyForURL(url, host) {\n" \
" let arr = [];\n" \
" arr[1000] = 0x1234;\n" \
"\n" \
" arr.__defineGetter__(256, function () {\n" \
" delete arr[256];\n" \
" arr.unshift(1.1);\n" \
" });\n" \
"\n" \
" let results = Object.entries(arr);\n" \
" let str = results.toString(); \n" \
" return \"DIRECT\";\n" \
"}\n" \
#define DIRECT_JS \
"function FindProxyForURL(url, host) {\n" \
" return \"DIRECT\";\n" \